Merge pull request #236734 from wegank/scid-vs-pc-bump

scid-vs-pc: 4.22 -> 4.24
This commit is contained in:
Weijia Wang 2023-06-09 11:06:37 +03:00 committed by GitHub
commit 432adce9d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 125 deletions

View File

@ -1,77 +0,0 @@
From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001
From: Sebastian Galkin <paraseba@gmail.com>
Date: Wed, 20 Dec 2017 18:23:03 -0200
Subject: [PATCH] put fonts in $out
---
Makefile.conf | 22 ++++------------------
configure | 12 ------------
2 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/Makefile.conf b/Makefile.conf
index e7f8de9..87f3fff 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -226,19 +226,11 @@ install_scid: all_scid
fi
install -m 755 -d $(SHAREDIR)/bitmaps
cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/
- @if [ "`id -u`" -eq 0 ]; then \
- install -m 755 -d $(FONTDIR); \
- install -m 644 -p fonts/*.ttf $(FONTDIR); \
- else \
- install -m 755 -d ~/.fonts; \
- install -m 644 -p fonts/*.ttf ~/.fonts; \
- fi
+ install -m 755 -d $(FONTDIR); \
+ install -m 644 -p fonts/*.ttf $(FONTDIR); \
+
@if [ ! -z "`which fc-cache`" ]; then \
- if [ "`id -u`" -eq 0 ]; then \
- fc-cache -fv $(FONTDIR); \
- else \
- fc-cache -fv ~/.fonts; \
- fi; \
+ fc-cache -fv $(FONTDIR); \
else \
echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
echo "Please contact your system administrator."; \
@@ -292,12 +284,6 @@ uninstall:
for f in `ls fonts/*.ttf`; do \
rm -f ~/.$$f; \
done; \
- if [ ! -z "`which fc-cache`" ]; then \
- fc-cache -fv ~/.fonts; \
- fi; \
- if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \
- rmdir ~/.fonts; \
- fi; \
fi
clean:
diff --git a/configure b/configure
index 4599c77..8b09678 100755
--- a/configure
+++ b/configure
@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} {
exit 1
}
- if {[isDarwin]} {
- set var(FONTDIR) /Library/Fonts/
- } else {
- # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active
- set prefix /usr
- if {![file isdirectory $prefix/share/fonts]} {
- set var(FONTDIR) "~/.fonts"
- } else {
- set var(FONTDIR) $prefix/share/fonts/truetype/Scid
- }
- }
-
set line [gets $from]
while {1} {
set line [gets $from]
--
2.15.1

View File

@ -1,59 +1,28 @@
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, which, makeDesktopItem }:
tcl.mkTclDerivation rec {
pname = "scid-vs-pc";
version = "4.22";
version = "4.24";
src = fetchurl {
url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
hash = "sha256-x4Ljn1vaXrue16kUofWAH2sDNYC8h3NvzFjffRo0EhA=";
};
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace configure Makefile.conf \
--replace "~/.fonts" "$out/share/fonts/truetype/Scid" \
--replace "which fc-cache" "false"
'';
nativeBuildInputs = [ makeWrapper which ];
buildInputs = [ tk libX11 zlib ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
-e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
-e '/^ *set x11Path *{/a ${libX11}/lib/' \
configure
sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
tcl/config.tcl
'';
# configureFlags = [
# "BINDIR=$(out)/bin"
# "SHAREDIR=$(out)/share"
# "FONTDIR=$(out)/fonts"
# ];
preConfigure = ''configureFlags="
BINDIR=$out/bin
SHAREDIR=$out/share
FONTDIR=$out/fonts"
'';
patches = [
./0001-put-fonts-in-out.patch
configureFlags = [
"BINDIR=${placeholder "out"}/bin"
"SHAREDIR=${placeholder "out"}/share"
];
hardeningDisable = [ "format" ];
dontPatchShebangs = true;
# TODO: can this use tclWrapperArgs?
postFixup = ''
sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn"
sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
for cmd in $out/bin/* ; do
wrapProgram "$cmd" \
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
done
'';
postInstall = ''
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications/

View File

@ -37108,10 +37108,7 @@ with pkgs;
scid = callPackage ../games/scid { };
scid-vs-pc = callPackage ../games/scid-vs-pc {
tcl = tcl-8_6;
tk = tk-8_6;
};
scid-vs-pc = callPackage ../games/scid-vs-pc { };
scummvm = callPackage ../games/scummvm {
stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv;