1 |
mr_bones_ 09/05/31 07:11:56 |
2 |
|
3 |
Added: gcompris-8.4.12-build.patch |
4 |
Log: |
5 |
version bump |
6 |
(Portage version: 2.1.6.11/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 games-kids/gcompris/files/gcompris-8.4.12-build.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/gcompris/files/gcompris-8.4.12-build.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/gcompris/files/gcompris-8.4.12-build.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gcompris-8.4.12-build.patch |
15 |
=================================================================== |
16 |
diff -ru gcompris-8.4.12.orig/Makefile.am gcompris-8.4.12/Makefile.am |
17 |
--- gcompris-8.4.12.orig/Makefile.am 2008-12-14 15:30:56.000000000 -0500 |
18 |
+++ gcompris-8.4.12/Makefile.am 2009-05-31 01:04:35.000000000 -0400 |
19 |
@@ -17,7 +17,7 @@ |
20 |
endif |
21 |
|
22 |
|
23 |
-icondir=$(datadir)/pixmaps |
24 |
+icondir=/usr/share/pixmaps |
25 |
icon_DATA = gcompris.png gcompris-edit.png |
26 |
|
27 |
if BUILD_MINGW32 |
28 |
@@ -25,7 +25,7 @@ |
29 |
Applications_in_files = |
30 |
Applications_DATA = |
31 |
else |
32 |
-Applicationsdir = $(datadir)/applications/ |
33 |
+Applicationsdir = /usr/share/applications |
34 |
Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in |
35 |
Applications_DATA = gcompris.desktop gcompris-edit.desktop |
36 |
endif |
37 |
diff -ru gcompris-8.4.12.orig/configure.in gcompris-8.4.12/configure.in |
38 |
--- gcompris-8.4.12.orig/configure.in 2009-03-29 06:35:55.000000000 -0400 |
39 |
+++ gcompris-8.4.12/configure.in 2009-05-31 01:09:09.000000000 -0400 |
40 |
@@ -146,6 +146,14 @@ |
41 |
AC_SUBST(XML_CFLAGS) |
42 |
AC_SUBST(XML_LIBS) |
43 |
|
44 |
+PKG_CHECK_MODULES(LIBGNOMECANVAS, libgnomecanvas-2.0) |
45 |
+AC_SUBST(LIBGNOMECANVAS_CFLAGS) |
46 |
+AC_SUBST(LIBGNOMECANVAS_LIBS) |
47 |
+ |
48 |
+PKG_CHECK_MODULES(LIBART_LGPL, libart-2.0) |
49 |
+AC_SUBST(LIBART_LGPL_CFLAGS) |
50 |
+AC_SUBST(LIBART_LGPL_LIBS) |
51 |
+ |
52 |
dnl Freetype2 flags (needed for libgnomecanvas) |
53 |
PKG_CHECK_MODULES(FT2, freetype2) |
54 |
AC_SUBST(FT2_CFLAGS) |
55 |
@@ -225,10 +233,8 @@ |
56 |
USE_DEBUG="$enableval", USE_DEBUG="no") |
57 |
if test "x$USE_DEBUG" == "xyes" ; then |
58 |
AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.") |
59 |
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g" |
60 |
-else |
61 |
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror" |
62 |
fi |
63 |
+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall" |
64 |
|
65 |
dnl WIN32 Specifics |
66 |
AC_MSG_CHECKING([for native Win32]) |
67 |
@@ -297,25 +303,25 @@ |
68 |
if test "x$platform_win32" = "xno" ; then |
69 |
|
70 |
dnl Set PACKAGE_LOCALE_DIR in config.h. |
71 |
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory]) |
72 |
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory]) |
73 |
|
74 |
dnl Set PACKAGE_DATA_DIR |
75 |
PACKAGE_DATA_DIR="boards" |
76 |
AC_SUBST(PACKAGE_DATA_DIR) |
77 |
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory]) |
78 |
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory]) |
79 |
|
80 |
dnl Set PACKAGE_HELP_DIR |
81 |
- PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help" |
82 |
+ PACKAGE_HELP_DIR="${datadir}/${PACKAGE}/help" |
83 |
AC_SUBST(PACKAGE_HELP_DIR) |
84 |
|
85 |
dnl Plugin Directory |
86 |
my_libdir=`eval echo "${libdir}"` |
87 |
- AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory]) |
88 |
+ AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory]) |
89 |
plugindir=$libdir/gcompris |
90 |
AC_SUBST(plugindir) |
91 |
|
92 |
dnl Python plugin Directory |
93 |
- PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python" |
94 |
+ PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python" |
95 |
AC_SUBST(PYTHON_PLUGIN_DIR) |
96 |
|
97 |
dnl System GCompris config directory |
98 |
@@ -545,8 +551,6 @@ |
99 |
src/boards/python/gcompris/utils/Makefile |
100 |
src/boards/python/connect4p/Makefile |
101 |
src/boards/python/admin/Makefile |
102 |
-src/libart_lgpl/Makefile |
103 |
-src/libgnomecanvas/Makefile |
104 |
po/Makefile.in |
105 |
docs/Makefile |
106 |
docs/C/Makefile |
107 |
diff -ru gcompris-8.4.12.orig/docs/C/Makefile.am gcompris-8.4.12/docs/C/Makefile.am |
108 |
--- gcompris-8.4.12.orig/docs/C/Makefile.am 2008-03-12 16:26:23.000000000 -0400 |
109 |
+++ gcompris-8.4.12/docs/C/Makefile.am 2009-05-31 01:09:44.000000000 -0400 |
110 |
@@ -10,7 +10,7 @@ |
111 |
overview.dia \ |
112 |
$(man_MANS) |
113 |
|
114 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C |
115 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C |
116 |
|
117 |
all: $(doc) |
118 |
|
119 |
diff -ru gcompris-8.4.12.orig/docs/eu/Makefile.am gcompris-8.4.12/docs/eu/Makefile.am |
120 |
--- gcompris-8.4.12.orig/docs/eu/Makefile.am 2008-10-28 17:36:12.000000000 -0400 |
121 |
+++ gcompris-8.4.12/docs/eu/Makefile.am 2009-05-31 01:10:09.000000000 -0400 |
122 |
@@ -8,7 +8,7 @@ |
123 |
overview.dia \ |
124 |
gcompris.texi |
125 |
|
126 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu |
127 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu |
128 |
|
129 |
all: $(doc) |
130 |
|
131 |
diff -ru gcompris-8.4.12.orig/docs/fr/Makefile.am gcompris-8.4.12/docs/fr/Makefile.am |
132 |
--- gcompris-8.4.12.orig/docs/fr/Makefile.am 2008-10-28 17:35:25.000000000 -0400 |
133 |
+++ gcompris-8.4.12/docs/fr/Makefile.am 2009-05-31 01:10:17.000000000 -0400 |
134 |
@@ -8,7 +8,7 @@ |
135 |
overview.dia \ |
136 |
gcompris.texi |
137 |
|
138 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr |
139 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr |
140 |
|
141 |
all: $(doc) |
142 |
|
143 |
diff -ru gcompris-8.4.12.orig/po/Makefile.in.in gcompris-8.4.12/po/Makefile.in.in |
144 |
--- gcompris-8.4.12.orig/po/Makefile.in.in 2009-03-29 06:39:29.000000000 -0400 |
145 |
+++ gcompris-8.4.12/po/Makefile.in.in 2009-05-31 01:10:51.000000000 -0400 |
146 |
@@ -34,7 +34,7 @@ |
147 |
datarootdir = @datarootdir@ |
148 |
libdir = @libdir@ |
149 |
DATADIRNAME = @DATADIRNAME@ |
150 |
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale |
151 |
+itlocaledir = /usr/share/locale |
152 |
subdir = po |
153 |
install_sh = @install_sh@ |
154 |
# Automake >= 1.8 provides @mkdir_p@. |
155 |
diff -ru gcompris-8.4.12.orig/src/Makefile.am gcompris-8.4.12/src/Makefile.am |
156 |
--- gcompris-8.4.12.orig/src/Makefile.am 2007-05-22 16:15:05.000000000 -0400 |
157 |
+++ gcompris-8.4.12/src/Makefile.am 2009-05-31 01:11:02.000000000 -0400 |
158 |
@@ -1,3 +1,3 @@ |
159 |
## Process this file with automake to produce Makefile.in |
160 |
|
161 |
-SUBDIRS = libart_lgpl libgnomecanvas gcompris boards |
162 |
+SUBDIRS = gcompris boards |
163 |
diff -ru gcompris-8.4.12.orig/src/boards/Makefile.am gcompris-8.4.12/src/boards/Makefile.am |
164 |
--- gcompris-8.4.12.orig/src/boards/Makefile.am 2009-03-16 17:59:02.000000000 -0400 |
165 |
+++ gcompris-8.4.12/src/boards/Makefile.am 2009-05-31 01:12:45.000000000 -0400 |
166 |
@@ -80,6 +80,8 @@ |
167 |
-I$(top_srcdir)/src \ |
168 |
$(GCOMPRIS_CFLAGS) \ |
169 |
$(XML_CFLAGS) \ |
170 |
+ $(LIBART_LGPL_CFLAGS) \ |
171 |
+ $(LIBGNOMECANVAS_CFLAGS) \ |
172 |
$(PYTHON_CFLAGS) \ |
173 |
$(PYGTK_CFLAGS) \ |
174 |
$(sqlite_cflags) \ |
175 |
@@ -110,7 +112,7 @@ |
176 |
libclockgame_la_SOURCES = clockgame.c |
177 |
|
178 |
|
179 |
-libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) |
180 |
+libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) |
181 |
libshapegame_la_LIBADD = |
182 |
libshapegame_la_SOURCES = shapegame.c |
183 |
|
184 |
@@ -154,12 +156,12 @@ |
185 |
libmemory_la_SOURCES = memory.c |
186 |
|
187 |
|
188 |
-libimageid_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) |
189 |
+libimageid_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) |
190 |
libimageid_la_LIBADD = |
191 |
libimageid_la_SOURCES = imageid.c |
192 |
|
193 |
|
194 |
-libmissingletter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) |
195 |
+libmissingletter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) |
196 |
libmissingletter_la_LIBADD = |
197 |
libmissingletter_la_SOURCES = missingletter.c missingletter_config.c |
198 |
|
199 |
@@ -208,7 +210,7 @@ |
200 |
libcanal_lock_la_LIBADD = |
201 |
libcanal_lock_la_SOURCES = canal_lock.c |
202 |
|
203 |
-libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) |
204 |
+libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) |
205 |
libadvanced_colors_la_LIBADD = |
206 |
libadvanced_colors_la_SOURCES = advanced_colors.c |
207 |
|
208 |
@@ -216,7 +218,7 @@ |
209 |
libsuperbrain_la_LIBADD = |
210 |
libsuperbrain_la_SOURCES = superbrain.c |
211 |
|
212 |
-libread_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) |
213 |
+libread_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) |
214 |
libread_colors_la_LIBADD = |
215 |
libread_colors_la_SOURCES = read_colors.c |
216 |
|
217 |
diff -ru gcompris-8.4.12.orig/src/gcompris/Makefile.am gcompris-8.4.12/src/gcompris/Makefile.am |
218 |
--- gcompris-8.4.12.orig/src/gcompris/Makefile.am 2009-02-04 18:26:53.000000000 -0500 |
219 |
+++ gcompris-8.4.12/src/gcompris/Makefile.am 2009-05-31 01:13:41.000000000 -0400 |
220 |
@@ -51,6 +51,8 @@ |
221 |
$(GCOMPRIS_CFLAGS) \ |
222 |
$(GNOME_INCLUDEDIR) \ |
223 |
$(XML_CFLAGS) \ |
224 |
+ $(LIBART_LGPL_CFLAGS) \ |
225 |
+ $(LIBGNOMECANVAS_CFLAGS) \ |
226 |
-DGNOME_DISABLE_DEPRECATED \ |
227 |
$(sqlite_cflags) \ |
228 |
$(GNET_CFLAGS) \ |
229 |
@@ -120,12 +122,11 @@ |
230 |
wordlist.h |
231 |
|
232 |
gcompris_LDFLAGS = \ |
233 |
- -export-dynamic $(top_builddir)/src/libgnomecanvas/libgnomecanvas-2.a \ |
234 |
- $(top_builddir)/src/libart_lgpl/libart_lgpl_2.a |
235 |
+ -export-dynamic |
236 |
|
237 |
|
238 |
gcompris_LDADD = \ |
239 |
- $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \ |
240 |
+ $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) \ |
241 |
$(INTLLIBS) $(NSBUNDLE_LDFLAGS) $(XF86VM_LIBS) |
242 |
|
243 |
EXTRA_DIST = \ |
244 |
diff -ru gcompris-8.4.12.orig/src/gcompris/gcompris.c gcompris-8.4.12/src/gcompris/gcompris.c |
245 |
--- gcompris-8.4.12.orig/src/gcompris/gcompris.c 2009-02-19 16:51:20.000000000 -0500 |
246 |
+++ gcompris-8.4.12/src/gcompris/gcompris.c 2009-05-31 01:14:27.000000000 -0400 |
247 |
@@ -1158,7 +1158,7 @@ |
248 |
properties->package_locale_dir = gbr_find_locale_dir(PACKAGE_LOCALE_DIR); |
249 |
properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL); |
250 |
properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python", NULL); |
251 |
- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL); |
252 |
+ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL); |
253 |
g_free(pkg_data_dir); |
254 |
g_free(pkg_clib_dir); |
255 |
} |