From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 23 Dec 2017 20:48:53 +0000
Subject: gentoo resync : 23.12.2017

---
 games-kids/gcompris/Manifest                       |  1 -
 .../gcompris/files/gcompris-14.12-build.patch      | 81 ----------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 games-kids/gcompris/files/gcompris-14.12-build.patch

(limited to 'games-kids/gcompris')

diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index c318b0beb8eb..c8a06f4e783d 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,4 +1,3 @@
-AUX gcompris-14.12-build.patch 2824 BLAKE2B e0d0974e06f344f7d53f37cd88b2e9200e963ede7cf128b6194527358883808a58d80478c2d9a878a7eed0ec594fa2fd87c72f0c3025d275aa5bb445c7d11457 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d
 AUX gcompris-15.10-build.patch 2824 BLAKE2B e0d0974e06f344f7d53f37cd88b2e9200e963ede7cf128b6194527358883808a58d80478c2d9a878a7eed0ec594fa2fd87c72f0c3025d275aa5bb445c7d11457 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d
 DIST gcompris-15.10.tar.bz2 279959562 BLAKE2B f8c9287a881a98bacf9b057e518597552a2f84f8bb9143684c1f7ba8f7803589c44b383c17af5b21715f4c71c78456540c5334cea4247380d28abd161b5ae756 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc
 EBUILD gcompris-15.10-r1.ebuild 1991 BLAKE2B e026f977e1dc8d1fdfff89b0921c7581606216ccfd38157985fae43bfd82a5cee6d4429cf01a8254cbae39a51aabb78109cd5953c6b9cc787a3680504c9492ff SHA512 23980183bd8d221af17d61de9ab4471abbd1a64d5f157cb21aef94357d880919c7534f3a97a8565897a9a1019f880ff34d598a3a5398d0ca9c01119cdce49a69
diff --git a/games-kids/gcompris/files/gcompris-14.12-build.patch b/games-kids/gcompris/files/gcompris-14.12-build.patch
deleted file mode 100644
index 077d1f6baf1a..000000000000
--- a/games-kids/gcompris/files/gcompris-14.12-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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);
-- 
cgit v1.2.3