1 |
hasufell 14/09/01 00:36:56 |
2 |
|
3 |
Added: scid-4.5.2-gentoo.patch |
4 |
Log: |
5 |
version bump wrt #506534, convert to python-any-r1 |
6 |
|
7 |
(Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 games-board/scid/files/scid-4.5.2-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.5.2-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/scid/files/scid-4.5.2-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: scid-4.5.2-gentoo.patch |
16 |
=================================================================== |
17 |
--- engines/togaII1.2.1a/src/Makefile.old 2012-05-06 20:56:56.190522872 +0200 |
18 |
+++ engines/togaII1.2.1a/src/Makefile 2012-05-06 20:58:20.995568403 +0200 |
19 |
@@ -18,23 +18,16 @@ |
20 |
|
21 |
# general |
22 |
|
23 |
-CXX = g++ |
24 |
-CXXFLAGS = -pipe -Wall |
25 |
-LDFLAGS = -lm |
26 |
|
27 |
# C++ |
28 |
|
29 |
-CXXFLAGS += -fno-exceptions -fno-rtti |
30 |
|
31 |
# optimisation |
32 |
|
33 |
-CXXFLAGS += -O3 -fstrict-aliasing |
34 |
-CXXFLAGS += -fomit-frame-pointer |
35 |
# CXXFLAGS += -march=athlon-xp # SELECT ME |
36 |
|
37 |
# strip |
38 |
|
39 |
-LDFLAGS += -s |
40 |
|
41 |
# dependencies |
42 |
|
43 |
--- tcl/utils/sound.tcl.old 2012-05-06 21:05:31.475342861 +0200 |
44 |
+++ tcl/utils/sound.tcl 2012-05-06 21:06:07.066843851 +0200 |
45 |
@@ -41,7 +41,7 @@ |
46 |
variable soundFolder |
47 |
|
48 |
::splash::add "Setting up audio move announcement..." |
49 |
- if {[catch {package require snack 2.0}]} { |
50 |
+ if {[catch {package require snack}]} { |
51 |
set hasSnackPackage 0 |
52 |
::splash::add " Move speech disabled - Snack sound package not found" |
53 |
return |
54 |
--- Makefile.conf.old 2013-11-28 06:58:08.000000000 +0100 |
55 |
+++ Makefile.conf 2014-04-18 00:17:05.783340379 +0200 |
56 |
@@ -193,7 +193,7 @@ |
57 |
# Small extra programs. Most are written in Tcl using tkscid, but |
58 |
# a few contributed ones may be in Python or other languages. |
59 |
# |
60 |
-SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco spf2spi |
61 |
+SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix eco2pgn spliteco spf2spi |
62 |
|
63 |
#################### |
64 |
|
65 |
@@ -218,25 +218,25 @@ |
66 |
install: $(INSTALL) |
67 |
|
68 |
install_scid: all_scid |
69 |
- install -m 755 -d $(SHAREDIR) |
70 |
- install -m 755 -d $(BINDIR) |
71 |
- install -m 755 scid $(SCRIPTS) $(EXECS) $(BINDIR) |
72 |
- install -m 644 -p scid.eco $(SHAREDIR) |
73 |
- install -m 755 -d $(SHAREDIR)/books |
74 |
- install -m 666 ./books/*.* $(SHAREDIR)/books/ |
75 |
- install -m 755 -d $(SHAREDIR)/bases |
76 |
- if test -d ./bases; then install -m 666 ./bases/*.* $(SHAREDIR)/bases/ ; fi |
77 |
- install -m 755 -d $(SHAREDIR)/html |
78 |
- cp -r ./html/* $(SHAREDIR)/html/ |
79 |
- install -m 755 -d $(SHAREDIR)/img/ |
80 |
- cp -r ./img/* $(SHAREDIR)/img/ |
81 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)" |
82 |
+ install -m 755 -d "$(DESTDIR)$(BINDIR)" |
83 |
+ install -m 755 scid $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)" |
84 |
+ install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)" |
85 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books" |
86 |
+ install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/" |
87 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases" |
88 |
+ if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi |
89 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html" |
90 |
+ cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/" |
91 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/" |
92 |
+ cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/" |
93 |
|
94 |
install_engines: all_engines |
95 |
- install -m 755 -d $(SHAREDIR)/engines |
96 |
- install -m 755 -d $(SHAREDIR)/engines/phalanx-scid |
97 |
- install ./engines/phalanx-scid/phalanx-scid $(SHAREDIR)/engines/phalanx-scid |
98 |
- install -m 755 -d $(SHAREDIR)/engines/togaII1.2.1a |
99 |
- install ./engines/togaII1.2.1a/src/togaII $(SHAREDIR)/engines/togaII1.2.1a/ |
100 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines" |
101 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid" |
102 |
+ install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid" |
103 |
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a" |
104 |
+ install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/" |
105 |
|
106 |
install_mac: all |
107 |
install -m 755 -d dist/Scid.app/Contents/MacOS |
108 |
@@ -288,25 +288,25 @@ |
109 |
hdiutil create -fs "HFS+" -volname Scid -srcfolder dist "Scid $(SCID_VERSION) (`sw_vers -productName` `sw_vers -productVersion` `uname -p`).dmg" |
110 |
|
111 |
uninstall: |
112 |
- rm -rf $(SHAREDIR)/engines |
113 |
- rm -rf $(SHAREDIR)/books |
114 |
- rm -rf $(SHAREDIR)/bases |
115 |
- rm -rf $(SHAREDIR)/data/ |
116 |
- rm -f $(SHAREDIR)/data/scid.eco |
117 |
- rm -f $(BINDIR)/scid $(BINDIR)/sc_addmove $(BINDIR)/sc_epgn |
118 |
- rm -f $(BINDIR)/sc_spell $(BINDIR)/sc_eco $(BINDIR)/sc_import |
119 |
- rm -f $(BINDIR)/sc_remote $(BINDIR)/sc_tree $(BINDIR)/scidpgn |
120 |
- rm -f $(BINDIR)/pgnfix $(BINDIR)/spliteco |
121 |
- rm -f $(BINDIR)/pgnscid $(BINDIR)/tkscid |
122 |
- rm -f $(BINDIR)/scmerge $(BINDIR)/scidlet |
123 |
- rm -rf $(SHAREDIR)/html |
124 |
+ rm -rf "$(DESTDIR)$(SHAREDIR)/engines" |
125 |
+ rm -rf "$(DESTDIR)$(SHAREDIR)/books" |
126 |
+ rm -rf "$(DESTDIR)$(SHAREDIR)/bases" |
127 |
+ rm -rf "$(DESTDIR)$(SHAREDIR)/data/" |
128 |
+ rm -f "$(DESTDIR)$(SHAREDIR)/data/scid.eco" |
129 |
+ rm -f "$(DESTDIR)$(BINDIR)/scid $(BINDIR)/sc_addmove" "$(DESTDIR)$(BINDIR)/sc_epgn" |
130 |
+ rm -f "$(DESTDIR)$(BINDIR)/sc_spell" "$(DESTDIR)$(BINDIR)/sc_eco" "$(DESTDIR)$(BINDIR)/sc_import" |
131 |
+ rm -f "$(DESTDIR)$(BINDIR)/sc_remote" "$(DESTDIR)$(BINDIR)/sc_tree" "$(DESTDIR)$(BINDIR)/scidpgn" |
132 |
+ rm -f "$(DESTDIR)$(BINDIR)/pgnfix" "$(DESTDIR)$(BINDIR)/spliteco" |
133 |
+ rm -f "$(DESTDIR)$(BINDIR)/pgnscid" "$(DESTDIR)$(BINDIR)/tkscid" |
134 |
+ rm -f "$(DESTDIR)$(BINDIR)/scmerge" "$(DESTDIR)$(BINDIR)/scidlet" |
135 |
+ rm -rf "$(DESTDIR)$(SHAREDIR)/html" |
136 |
|
137 |
### To remove Scid files placed in the BINDIR and SHAREDIR directories, |
138 |
# type "make distclean". |
139 |
# |
140 |
distclean: |
141 |
- cd $(BINDIR) && rm -f $(EXECS) $(SCRIPTS) |
142 |
- -rm -f $(SHAREDIR)/scid.eco |
143 |
+ cd $(DESTDIR)$(BINDIR) && rm -f "$(EXECS)" "$(SCRIPTS)" |
144 |
+ -rm -f "$(DESTDIR)$(SHAREDIR)/scid.eco" |
145 |
|
146 |
### To remove object and executable files: type "make clean". |
147 |
# |
148 |
--- tcl/start.tcl.old 2013-11-28 06:58:08.000000000 +0100 |
149 |
+++ tcl/start.tcl 2014-04-18 00:37:25.796397765 +0200 |
150 |
@@ -186,7 +186,7 @@ |
151 |
|
152 |
# scidShareDir, scidImgDir, scidBooksDir, scidBasesDir, ecoFile: |
153 |
# Location of Scid resources |
154 |
- set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]] |
155 |
+ set scidShareDir "@GENTOO_DATADIR@" |
156 |
if {! [file isdirectory $::scidShareDir]} { |
157 |
set scidShareDir $::scidExeDir |
158 |
} |
159 |
@@ -849,7 +849,7 @@ |
160 |
|
161 |
### Audio move announcement options: |
162 |
|
163 |
-set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]] |
164 |
+set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds" |
165 |
set ::utils::sound::announceNew 0 |
166 |
set ::utils::sound::announceForward 0 |
167 |
set ::utils::sound::announceBack 0 |
168 |
@@ -858,7 +858,7 @@ |
169 |
if {$windowsOS} { |
170 |
set spellCheckFile [file join $scidDataDir "spelling.ssp"] |
171 |
} else { |
172 |
- set spellCheckFile "/usr/local/share/scid/spelling.ssp" |
173 |
+ set spellCheckFile "@GENTOO_DATADIR@/spelling.ssp" |
174 |
} |
175 |
|
176 |
# book configuration |