1 |
mr_bones_ 11/12/21 07:21:30 |
2 |
|
3 |
Added: gcompris-11.12-build.patch |
4 |
Removed: gcompris-11.09-build.patch |
5 |
Log: |
6 |
version bump |
7 |
|
8 |
(Portage version: 2.1.10.41/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 games-kids/gcompris/files/gcompris-11.12-build.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-11.12-build.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-11.12-build.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: gcompris-11.12-build.patch |
17 |
=================================================================== |
18 |
--- gcompris-9.5.orig/Makefile.am |
19 |
+++ gcompris-9.5/Makefile.am |
20 |
@@ -17,7 +17,7 @@ |
21 |
# endif |
22 |
|
23 |
|
24 |
-icondir=$(datadir)/pixmaps |
25 |
+icondir=/usr/share/pixmaps |
26 |
icon_DATA = gcompris.png gcompris-edit.png |
27 |
|
28 |
if BUILD_MINGW32 |
29 |
@@ -25,7 +25,7 @@ |
30 |
Applications_in_files = |
31 |
Applications_DATA = |
32 |
else |
33 |
-Applicationsdir = $(datadir)/applications/ |
34 |
+Applicationsdir = /usr/share/applications/ |
35 |
Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in |
36 |
Applications_DATA = gcompris.desktop gcompris-edit.desktop |
37 |
endif |
38 |
--- gcompris-9.5.orig/configure.ac |
39 |
+++ gcompris-9.5/configure.ac |
40 |
@@ -203,10 +203,8 @@ |
41 |
USE_DEBUG="$enableval", USE_DEBUG="no") |
42 |
if test "x$USE_DEBUG" == "xyes" ; then |
43 |
AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.") |
44 |
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g" |
45 |
-else |
46 |
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -O2" |
47 |
fi |
48 |
+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall" |
49 |
|
50 |
dnl disable activation code |
51 |
AC_ARG_ENABLE(disable-activation-code, |
52 |
@@ -337,28 +335,28 @@ |
53 |
fi |
54 |
else |
55 |
dnl Set PACKAGE_LOCALE_DIR in config.h. |
56 |
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory]) |
57 |
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory]) |
58 |
|
59 |
dnl Set PACKAGE_DATA_DIR |
60 |
PACKAGE_DATA_DIR="boards" |
61 |
AC_SUBST(PACKAGE_DATA_DIR) |
62 |
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory]) |
63 |
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory]) |
64 |
|
65 |
dnl Plugin Directory |
66 |
my_libdir=`eval echo "${libdir}"` |
67 |
- AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory]) |
68 |
+ AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory]) |
69 |
plugindir=$libdir/gcompris |
70 |
AC_SUBST(plugindir) |
71 |
|
72 |
dnl Python plugin Directory |
73 |
- PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python" |
74 |
+ PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python" |
75 |
AC_SUBST(PYTHON_PLUGIN_DIR) |
76 |
|
77 |
dnl System GCompris config directory |
78 |
AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory]) |
79 |
|
80 |
dnl Test for gnuchess |
81 |
- AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH]) |
82 |
+ AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH]) |
83 |
if test x$GNUCHESS = xno; then |
84 |
AC_MSG_ERROR(Couldn't find gnuchess, please install the gnuchess package version 5 or above) |
85 |
fi |
86 |
--- gcompris-9.5.orig/docs/C/Makefile.am |
87 |
+++ gcompris-9.5/docs/C/Makefile.am |
88 |
@@ -10,7 +10,7 @@ |
89 |
overview.dia \ |
90 |
$(man_MANS) |
91 |
|
92 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C |
93 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C |
94 |
|
95 |
all: $(doc) |
96 |
|
97 |
--- gcompris-9.5.orig/docs/eu/Makefile.am |
98 |
+++ gcompris-9.5/docs/eu/Makefile.am |
99 |
@@ -8,7 +8,7 @@ |
100 |
overview.dia \ |
101 |
gcompris.texi |
102 |
|
103 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu |
104 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu |
105 |
|
106 |
all: $(doc) |
107 |
|
108 |
--- gcompris-9.5.orig/docs/fr/Makefile.am |
109 |
+++ gcompris-9.5/docs/fr/Makefile.am |
110 |
@@ -8,7 +8,7 @@ |
111 |
overview.dia \ |
112 |
gcompris.texi |
113 |
|
114 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr |
115 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr |
116 |
|
117 |
all: $(doc) |
118 |
|
119 |
--- gcompris-9.5.orig/po/Makefile.in.in |
120 |
+++ gcompris-9.5/po/Makefile.in.in |
121 |
@@ -34,7 +34,7 @@ |
122 |
datarootdir = @datarootdir@ |
123 |
libdir = @libdir@ |
124 |
DATADIRNAME = @DATADIRNAME@ |
125 |
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale |
126 |
+itlocaledir = /usr/share/locale |
127 |
subdir = po |
128 |
install_sh = @install_sh@ |
129 |
# Automake >= 1.8 provides @mkdir_p@. |
130 |
--- gcompris-9.5.orig/src/gcompris/gcompris.c |
131 |
+++ gcompris-9.5/src/gcompris/gcompris.c |
132 |
@@ -1308,7 +1308,7 @@ |
133 |
properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL); |
134 |
properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python", |
135 |
NULL); |
136 |
- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL); |
137 |
+ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL); |
138 |
properties->menu_dir = g_strdup(properties->package_data_dir); |
139 |
g_free(pkg_data_dir); |
140 |
g_free(pkg_clib_dir); |