[gentoo-commits] gentoo-x86 commit in games-kids/gcompris/files: gcompris-12.11-build.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    12/11/29 20:01:20

  Added:                gcompris-12.11-build.patch
  Log:
  version bump (bug #445051)
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  games-kids/gcompris/files/gcompris-12.11-build.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-12.11-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-12.11-build.patch?rev=1.1&content-type=text/plain

Index: gcompris-12.11-build.patch
===================================================================
diff -ru gcompris-12.11.orig/Makefile.am gcompris-12.11/Makefile.am
--- gcompris-12.11.orig/Makefile.am	2012-05-29 13:39:35.000000000 -0400
+++ gcompris-12.11/Makefile.am	2012-11-28 15:13:10.438931729 -0500
@@ -17,7 +17,7 @@
 # endif
 
 
-icondir=$(datadir)/pixmaps
+icondir=/usr/share/pixmaps
 icon_DATA = gcompris.png gcompris-edit.png
 
 if BUILD_MINGW32
@@ -25,7 +25,7 @@
 Applications_in_files =
 Applications_DATA =
 else
-Applicationsdir = $(datadir)/applications/
+Applicationsdir = /usr/share/applications/
 Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
 Applications_DATA = gcompris.desktop gcompris-edit.desktop
 endif
diff -ru gcompris-12.11.orig/configure.ac gcompris-12.11/configure.ac
--- gcompris-12.11.orig/configure.ac	2012-11-18 11:18:29.000000000 -0500
+++ gcompris-12.11/configure.ac	2012-11-28 15:16:34.904426137 -0500
@@ -204,10 +204,8 @@
           USE_DEBUG="$enableval", USE_DEBUG="no")
 if test "x$USE_DEBUG" == "xyes" ; then
     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
-else
-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
 fi
+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
 
 dnl disable activation code
 AC_ARG_ENABLE(disable-activation-code,
@@ -345,21 +343,21 @@
   fi
 else
   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 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 System GCompris config directory
@@ -367,7 +365,7 @@
 
   dnl Test for gnuchess
   if test x$build_gnuchess = xno; then
-    AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
+    AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH])
   else
     GNUCHESS="gcompris-gnuchess"
   fi
diff -ru gcompris-12.11.orig/docs/C/Makefile.am gcompris-12.11/docs/C/Makefile.am
--- gcompris-12.11.orig/docs/C/Makefile.am	2012-09-16 09:25:23.000000000 -0400
+++ gcompris-12.11/docs/C/Makefile.am	2012-11-28 15:17:02.551410995 -0500
@@ -6,7 +6,7 @@
 
 EXTRA_DIST = $(man_MANS)
 
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
 
 # Info documentation is outdated and useless
 #all: $(doc)
diff -ru gcompris-12.11.orig/docs/fr/Makefile.am gcompris-12.11/docs/fr/Makefile.am
--- gcompris-12.11.orig/docs/fr/Makefile.am	2012-09-16 09:25:23.000000000 -0400
+++ gcompris-12.11/docs/fr/Makefile.am	2012-11-28 15:17:19.767778814 -0500
@@ -6,7 +6,7 @@
 #EXTRA_DIST = topic.dat \
 #	     gcompris.texi
 
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
 
 #all: $(doc)
 
diff -ru gcompris-12.11.orig/src/gcompris/gcompris.c gcompris-12.11/src/gcompris/gcompris.c
--- gcompris-12.11.orig/src/gcompris/gcompris.c	2012-10-26 19:24:09.000000000 -0400
+++ gcompris-12.11/src/gcompris/gcompris.c	2012-11-28 15:18:48.644514899 -0500
@@ -1322,7 +1322,7 @@
     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);
     properties->menu_dir = g_strdup(properties->package_data_dir);
     g_free(pkg_data_dir);
     g_free(pkg_clib_dir);