* [gentoo-commits] gentoo-x86 commit in games-kids/gcompris/files: gcompris-13.11-build.patch gcompris-14.12-build.patch
@ 2015-01-19 5:50 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; only message in thread
From: Michael Sterrett (mr_bones_) @ 2015-01-19 5:50 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 15/01/19 05:50:07
Modified: gcompris-13.11-build.patch
Added: gcompris-14.12-build.patch
Log:
version bump
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 games-kids/gcompris/files/gcompris-13.11-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-13.11-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-13.11-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-13.11-build.patch?r1=1.1&r2=1.2
Index: gcompris-13.11-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-kids/gcompris/files/gcompris-13.11-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcompris-13.11-build.patch 12 Nov 2013 16:26:09 -0000 1.1
+++ gcompris-13.11-build.patch 19 Jan 2015 05:50:07 -0000 1.2
@@ -1,6 +1,5 @@
-diff -ru gcompris-13.11.orig/Makefile.am gcompris-13.11/Makefile.am
---- gcompris-13.11.orig/Makefile.am 2013-08-31 05:21:59.000000000 -0400
-+++ gcompris-13.11/Makefile.am 2013-11-05 18:37:58.851772740 -0500
+--- gcompris-13.11.orig/Makefile.am
++++ gcompris-13.11/Makefile.am
@@ -7,7 +7,7 @@
# endif
@@ -19,9 +18,8 @@
Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
Applications_DATA = gcompris.desktop gcompris-edit.desktop
endif
-diff -ru gcompris-13.11.orig/configure.ac gcompris-13.11/configure.ac
---- gcompris-13.11.orig/configure.ac 2013-11-03 18:13:54.000000000 -0500
-+++ gcompris-13.11/configure.ac 2013-11-05 18:44:21.210250234 -0500
+--- gcompris-13.11.orig/configure.ac
++++ gcompris-13.11/configure.ac
@@ -57,7 +57,8 @@
gtk+-2.0 >= $GTK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -70,9 +68,8 @@
AC_SUBST(PYTHON_PLUGIN_DIR)
dnl System GCompris config directory
-diff -ru gcompris-13.11.orig/src/gcompris/gcompris.c gcompris-13.11/src/gcompris/gcompris.c
---- gcompris-13.11.orig/src/gcompris/gcompris.c 2013-10-02 18:13:32.000000000 -0400
-+++ gcompris-13.11/src/gcompris/gcompris.c 2013-11-05 18:43:42.907603900 -0500
+--- gcompris-13.11.orig/src/gcompris/gcompris.c
++++ gcompris-13.11/src/gcompris/gcompris.c
@@ -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",
1.1 games-kids/gcompris/files/gcompris-14.12-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-14.12-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-14.12-build.patch?rev=1.1&content-type=text/plain
Index: gcompris-14.12-build.patch
===================================================================
--- gcompris-13.11.orig/Makefile.am
+++ gcompris-13.11/Makefile.am
@@ -7,7 +7,7 @@
# endif
-icondir=$(datadir)/pixmaps
+icondir=/usr/share/pixmaps
icon_DATA = gcompris.png gcompris-edit.png
if BUILD_MINGW32
@@ -15,7 +15,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
--- gcompris-13.11.orig/configure.ac
+++ gcompris-13.11/configure.ac
@@ -57,7 +57,8 @@
gtk+-2.0 >= $GTK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
libxml-2.0 >= $LIBXML_REQUIRED \
- gthread-2.0 )
+ gthread-2.0 \
+ gmodule-2.0 )
AC_SUBST(GCOMPRIS_CFLAGS)
AC_SUBST(GCOMPRIS_LIBS)
@@ -204,10 +205,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,
@@ -336,21 +335,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
--- gcompris-13.11.orig/src/gcompris/gcompris.c
+++ gcompris-13.11/src/gcompris/gcompris.c
@@ -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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-01-19 5:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-19 5:50 [gentoo-commits] gentoo-x86 commit in games-kids/gcompris/files: gcompris-13.11-build.patch gcompris-14.12-build.patch Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox