summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-03-10 10:54:19 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-03-10 10:54:19 +0000
commit7093f8b14f6ad0bd956b7f2e2e24721e255910b0 (patch)
tree31ae5f3d5998667686cbb720b6f54b5b9d995918 /games-kids/gcompris/files
parent+games-kids/gcompris:gnet (diff)
downloadgentoo-2-7093f8b14f6ad0bd956b7f2e2e24721e255910b0.tar.gz
gentoo-2-7093f8b14f6ad0bd956b7f2e2e24721e255910b0.tar.bz2
gentoo-2-7093f8b14f6ad0bd956b7f2e2e24721e255910b0.zip
Version bump, bug #157472
(Portage version: 2.1.2.2)
Diffstat (limited to 'games-kids/gcompris/files')
-rw-r--r--games-kids/gcompris/files/digest-gcompris-8.2.23
-rw-r--r--games-kids/gcompris/files/gcompris-8.2.2-build.patch140
2 files changed, 143 insertions, 0 deletions
diff --git a/games-kids/gcompris/files/digest-gcompris-8.2.2 b/games-kids/gcompris/files/digest-gcompris-8.2.2
new file mode 100644
index 000000000000..31e9bd646df8
--- /dev/null
+++ b/games-kids/gcompris/files/digest-gcompris-8.2.2
@@ -0,0 +1,3 @@
+MD5 297d6507ed9a4c6558f8bce6b6f81406 gcompris-8.2.2.tar.gz 79037459
+RMD160 5baf13fe72dd7810e3da160ea4ccaa37912dc092 gcompris-8.2.2.tar.gz 79037459
+SHA256 4d5e6fc993ef0be753782c0fc0b35277e8369d25db83108db313437b55cea44d gcompris-8.2.2.tar.gz 79037459
diff --git a/games-kids/gcompris/files/gcompris-8.2.2-build.patch b/games-kids/gcompris/files/gcompris-8.2.2-build.patch
new file mode 100644
index 000000000000..1a21363fdb0d
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-8.2.2-build.patch
@@ -0,0 +1,140 @@
+--- configure.in
++++ configure.in
+@@ -149,10 +149,8 @@
+ USE_DEBUG="$enableval", USE_DEBUG="no")
+ if test "x$USE_DEBUG" == "xyes" ; then
+ AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
+- CFLAGS="$CFLAGS -Wall -Werror -g"
+-else
+- CFLAGS="$CFLAGS -Wall -Werror"
+ fi
++CFLAGS="$CFLAGS -Wall"
+
+ dnl WIN32 Specifics
+ AC_MSG_CHECKING([for native Win32])
+@@ -219,25 +217,25 @@
+ dnl
+
+ dnl Set PACKAGE_LOCALE_DIR in config.h.
+-AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
++AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
+
+ dnl Set PACKAGE_DATA_DIR
+ PACKAGE_DATA_DIR="boards"
+ AC_SUBST(PACKAGE_DATA_DIR)
+-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
++AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
+
+ dnl Set PACKAGE_HELP_DIR
+-PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"
++PACKAGE_HELP_DIR="${datadir}/${PACKAGE}/help"
+ AC_SUBST(PACKAGE_HELP_DIR)
+
+ dnl Plugin Directory
+ my_libdir=`eval echo "${libdir}"`
+-AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
++AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
+ plugindir=$libdir/gcompris
+ AC_SUBST(plugindir)
+
+ dnl Python plugin Directory
+-PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
++PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
+ AC_SUBST(PYTHON_PLUGIN_DIR)
+
+ dnl Test for gnuchess
+--- docs/C/Makefile.am
++++ docs/C/Makefile.am
+@@ -10,7 +10,7 @@
+ overview.dia \
+ $(man_MANS)
+
+-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
+
+ all: $(doc)
+
+--- docs/eu/Makefile.am
++++ docs/eu/Makefile.am
+@@ -8,7 +8,7 @@
+ overview.dia \
+ gcompris.texi
+
+-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu
++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu
+
+ all: $(doc)
+
+--- docs/fr/Makefile.am
++++ docs/fr/Makefile.am
+@@ -8,7 +8,7 @@
+ overview.dia \
+ gcompris.texi
+
+-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
+
+ all: $(doc)
+
+--- Makefile.am
++++ Makefile.am
+@@ -8,15 +8,13 @@
+
+ SUBDIRS = po src boards $(DOCS_SUBDIR) autopackage
+
+-icondir=$(datadir)/pixmaps
++icondir=/usr/share/pixmaps
+ icon_DATA = gcompris.png gcompris-edit.png
+
+-Applicationsdir = $(datadir)/applications/
++Applicationsdir = /usr/share/applications
+ Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
+ Applications_DATA = gcompris.desktop gcompris-edit.desktop
+
+-Menudir=$(prefix)/lib/menu
+-Menu_DATA=gcompris
+
+ @INTLTOOL_DESKTOP_RULE@
+
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = /usr/share/locale
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+--- src/gcompris/gcompris.c
++++ src/gcompris/gcompris.c
+@@ -1117,7 +1117,7 @@
+ properties->package_locale_dir = gbr_find_locale_dir(PACKAGE_LOCALE_DIR);
+ properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
+ properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python", NULL);
+- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
++ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
+ g_free(pkg_data_dir);
+ g_free(pkg_clib_dir);
+ }
+--- src/gcompris/Makefile.am
++++ src/gcompris/Makefile.am
+@@ -69,7 +69,7 @@
+
+ libgcomprisincludedir = $(includedir)/libgcompris-1.0/libgcompris
+
+-libgcomprisinclude_HEADERS = \
++noinst_HEADERS = \
+ about.h \
+ anim.h \
+ binreloc.h \
+@@ -97,7 +97,7 @@
+ $(cairo_h)
+
+ libgcompris_1_la_SOURCES = \
+- $(libgcomprisinclude_HEADERS) \
++ $(noinst_HEADERS) \
+ about.c \
+ anim.c \
+ bar.c \