mr_bones_ 15/08/03 21:09:04 Modified: scid-4.6.0-gentoo.patch scid-4.5.2-gentoo.patch Added: scid-4.6.2-gentoo.patch Log: version bump (Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-board/scid/files/scid-4.6.0-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.6.0-gentoo.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.6.0-gentoo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.6.0-gentoo.patch?r1=1.1&r2=1.2 Index: scid-4.6.0-gentoo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-board/scid/files/scid-4.6.0-gentoo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scid-4.6.0-gentoo.patch 9 May 2015 05:19:31 -0000 1.1 +++ scid-4.6.0-gentoo.patch 3 Aug 2015 21:09:04 -0000 1.2 @@ -1,6 +1,5 @@ -diff -ru scid-4.6.0.orig/engines/togaII1.2.1a/src/Makefile scid-4.6.0/engines/togaII1.2.1a/src/Makefile ---- scid-4.6.0.orig/engines/togaII1.2.1a/src/Makefile 2015-04-27 15:19:48.000000000 -0400 -+++ scid-4.6.0/engines/togaII1.2.1a/src/Makefile 2015-05-05 17:53:00.820096470 -0400 +--- scid-4.6.0.orig/engines/togaII1.2.1a/src/Makefile ++++ scid-4.6.0/engines/togaII1.2.1a/src/Makefile @@ -18,23 +18,16 @@ # general @@ -25,9 +24,8 @@ # dependencies -diff -ru scid-4.6.0.orig/Makefile.conf scid-4.6.0/Makefile.conf ---- scid-4.6.0.orig/Makefile.conf 2015-04-27 15:19:48.000000000 -0400 -+++ scid-4.6.0/Makefile.conf 2015-05-05 17:58:21.860098005 -0400 +--- scid-4.6.0.orig/Makefile.conf ++++ scid-4.6.0/Makefile.conf @@ -157,32 +157,31 @@ install: $(INSTALL) @@ -84,9 +82,8 @@ install_mac: all install -m 755 -d dist/Scid.app/Contents/MacOS -diff -ru scid-4.6.0.orig/tcl/start.tcl scid-4.6.0/tcl/start.tcl ---- scid-4.6.0.orig/tcl/start.tcl 2015-04-27 15:19:48.000000000 -0400 -+++ scid-4.6.0/tcl/start.tcl 2015-05-05 18:00:43.988229032 -0400 +--- scid-4.6.0.orig/tcl/start.tcl ++++ scid-4.6.0/tcl/start.tcl @@ -93,7 +93,7 @@ # scidShareDir, scidImgDir, scidTclDir, scidBooksDir, scidBasesDir, ecoFile: @@ -114,9 +111,8 @@ } # book configuration -diff -ru scid-4.6.0.orig/tcl/utils/sound.tcl scid-4.6.0/tcl/utils/sound.tcl ---- scid-4.6.0.orig/tcl/utils/sound.tcl 2015-04-27 15:19:48.000000000 -0400 -+++ scid-4.6.0/tcl/utils/sound.tcl 2015-05-05 17:53:14.320633946 -0400 +--- scid-4.6.0.orig/tcl/utils/sound.tcl ++++ scid-4.6.0/tcl/utils/sound.tcl @@ -43,7 +43,7 @@ variable soundFolder 1.2 games-board/scid/files/scid-4.5.2-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.5.2-gentoo.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.5.2-gentoo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.5.2-gentoo.patch?r1=1.1&r2=1.2 Index: scid-4.5.2-gentoo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-board/scid/files/scid-4.5.2-gentoo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scid-4.5.2-gentoo.patch 1 Sep 2014 00:36:56 -0000 1.1 +++ scid-4.5.2-gentoo.patch 3 Aug 2015 21:09:04 -0000 1.2 @@ -1,5 +1,5 @@ ---- engines/togaII1.2.1a/src/Makefile.old 2012-05-06 20:56:56.190522872 +0200 -+++ engines/togaII1.2.1a/src/Makefile 2012-05-06 20:58:20.995568403 +0200 +--- engines/togaII1.2.1a/src/Makefile.old ++++ engines/togaII1.2.1a/src/Makefile @@ -18,23 +18,16 @@ # general @@ -24,8 +24,8 @@ # dependencies ---- tcl/utils/sound.tcl.old 2012-05-06 21:05:31.475342861 +0200 -+++ tcl/utils/sound.tcl 2012-05-06 21:06:07.066843851 +0200 +--- tcl/utils/sound.tcl.old ++++ tcl/utils/sound.tcl @@ -41,7 +41,7 @@ variable soundFolder @@ -35,8 +35,8 @@ set hasSnackPackage 0 ::splash::add " Move speech disabled - Snack sound package not found" return ---- Makefile.conf.old 2013-11-28 06:58:08.000000000 +0100 -+++ Makefile.conf 2014-04-18 00:17:05.783340379 +0200 +--- Makefile.conf.old ++++ Makefile.conf @@ -193,7 +193,7 @@ # Small extra programs. Most are written in Tcl using tkscid, but # a few contributed ones may be in Python or other languages. @@ -129,8 +129,8 @@ ### To remove object and executable files: type "make clean". # ---- tcl/start.tcl.old 2013-11-28 06:58:08.000000000 +0100 -+++ tcl/start.tcl 2014-04-18 00:37:25.796397765 +0200 +--- tcl/start.tcl.old ++++ tcl/start.tcl @@ -186,7 +186,7 @@ # scidShareDir, scidImgDir, scidBooksDir, scidBasesDir, ecoFile: 1.1 games-board/scid/files/scid-4.6.2-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.6.2-gentoo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.6.2-gentoo.patch?rev=1.1&content-type=text/plain Index: scid-4.6.2-gentoo.patch =================================================================== --- scid-4.6.1.orig/engines/togaII1.2.1a/src/Makefile +++ scid-4.6.1/engines/togaII1.2.1a/src/Makefile @@ -18,23 +18,16 @@ # general -CXX = g++ -CXXFLAGS = -pipe -Wall -LDFLAGS = -lm # C++ -CXXFLAGS += -fno-exceptions -fno-rtti # optimisation -CXXFLAGS += -O3 -fstrict-aliasing -CXXFLAGS += -fomit-frame-pointer # CXXFLAGS += -march=athlon-xp # SELECT ME # strip -LDFLAGS += -s # dependencies --- scid-4.6.1.orig/Makefile.conf +++ scid-4.6.1/Makefile.conf @@ -157,32 +157,32 @@ install: $(INSTALL) install_scid: all_scid - install -m 755 -d "$(SHAREDIR)" - install -m 755 -d "$(BINDIR)" - install -m 755 $(SCRIPTS) $(EXECS) "$(BINDIR)" - rm -f "$(BINDIR)/scid" - @echo "#!/bin/sh" > "$(BINDIR)/scid" - @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(BINDIR)/scid" - chmod 755 "$(BINDIR)/scid" - chmod +x "$(BINDIR)/scid" - install -m 644 -p scid.eco "$(SHAREDIR)" - install -m 755 -d "$(SHAREDIR)/books" - install -m 666 ./books/*.* "$(SHAREDIR)/books/" - install -m 755 -d "$(SHAREDIR)/bases" - if test -d ./bases; then install -m 666 ./bases/*.* "$(SHAREDIR)/bases/" ; fi - install -m 755 -d "$(SHAREDIR)/html" - cp -r ./html/* "$(SHAREDIR)/html/" - install -m 755 -d "$(SHAREDIR)/img/" - cp -r ./img/* "$(SHAREDIR)/img/" - install -m 755 -d "$(SHAREDIR)/tcl/" - cp -r ./tcl/* "$(SHAREDIR)/tcl/" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)" + install -m 755 -d "$(DESTDIR)$(BINDIR)" + install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)" + rm -f "$(DESTDIR)$(BINDIR)/scid" + @echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid" + @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid" + chmod 755 "$(DESTDIR)$(BINDIR)/scid" + chmod +x "$(DESTDIR)$(BINDIR)/scid" + install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books" + install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases" + if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html" + cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/" + cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/" + cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/" install_engines: all_engines - install -m 755 -d "$(SHAREDIR)/engines" - install -m 755 -d "$(SHAREDIR)/engines/phalanx-scid" - install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid" - install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a" - install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid" + install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid" + install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a" + install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/" install_mac: all install -m 755 -d dist/Scid.app/Contents/MacOS --- scid-4.6.1.orig/tcl/options.tcl +++ scid-4.6.1/tcl/options.tcl @@ -598,7 +598,7 @@ } ### Audio move announcement options: -set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]] +set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds" set ::utils::sound::announceNew 0 set ::utils::sound::announceForward 0 set ::utils::sound::announceBack 0 @@ -607,7 +607,7 @@ if {$windowsOS} { set spellCheckFile [file join $scidExeDir "spelling.ssp"] } else { - set spellCheckFile "/usr/local/share/scid/spelling.ssp" + set spellCheckFile "@GENTOO_DATADIR@/spelling.ssp" } # book configuration --- scid-4.6.1.orig/tcl/start.tcl +++ scid-4.6.1/tcl/start.tcl @@ -93,7 +93,7 @@ # scidShareDir, scidImgDir, scidTclDir, scidBooksDir, scidBasesDir, ecoFile: # Location of Scid resources - set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]] + set scidShareDir "@GENTOO_DATADIR@" if {! [file isdirectory $::scidShareDir]} { set scidShareDir $::scidExeDir } --- scid-4.6.1.orig/tcl/utils/sound.tcl +++ scid-4.6.1/tcl/utils/sound.tcl @@ -43,7 +43,7 @@ variable soundFolder set hasSound 1 - if {[catch {package require snack 2.0}]} { + if {[catch {package require snack}]} { if {$::windowsOS} { catch { set ::utils::sound::pipe [open "| scidsnd.exe" "r+"]
