summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-10-26 20:04:24 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-10-26 20:04:24 +0000
commit42513657f9cfe8e618836a44faf594f823df4eef (patch)
tree808bb1a2ab708d102987857516d45ce3efbe1a67 /games-kids
parentfix underlinking wrt #484434 (diff)
downloadgentoo-2-42513657f9cfe8e618836a44faf594f823df4eef.tar.gz
gentoo-2-42513657f9cfe8e618836a44faf594f823df4eef.tar.bz2
gentoo-2-42513657f9cfe8e618836a44faf594f823df4eef.zip
fix underlinking wrt #488964
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-kids')
-rw-r--r--games-kids/gcompris/ChangeLog6
-rw-r--r--games-kids/gcompris/files/gcompris-12.11-underlinking.patch18
-rw-r--r--games-kids/gcompris/gcompris-12.11.ebuild5
3 files changed, 26 insertions, 3 deletions
diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 966af6ccb138..d71f4e7dae40 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-kids/gcompris
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.93 2013/07/04 06:01:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.94 2013/10/26 20:04:23 hasufell Exp $
+
+ 26 Oct 2013; Julian Ospald <hasufell@gentoo.org> gcompris-12.11.ebuild,
+ +files/gcompris-12.11-underlinking.patch:
+ fix underlinking wrt #488964
04 Jul 2013; Michael Sterrett <mr_bones_@gentoo.org> gcompris-12.11.ebuild:
add slot to libsdl dep
diff --git a/games-kids/gcompris/files/gcompris-12.11-underlinking.patch b/games-kids/gcompris/files/gcompris-12.11-underlinking.patch
new file mode 100644
index 000000000000..2270ad27f466
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-12.11-underlinking.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Oct 26 19:40:23 UTC 2013
+Subject: fix underlinking
+
+https://bugs.gentoo.org/show_bug.cgi?id=488964
+
+--- gcompris-12.11/configure.ac
++++ gcompris-12.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)
diff --git a/games-kids/gcompris/gcompris-12.11.ebuild b/games-kids/gcompris/gcompris-12.11.ebuild
index eb85a15e7db1..8f9b5a7ae34e 100644
--- a/games-kids/gcompris/gcompris-12.11.ebuild
+++ b/games-kids/gcompris/gcompris-12.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.11.ebuild,v 1.5 2013/07/04 06:01:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.11.ebuild,v 1.6 2013/10/26 20:04:23 hasufell Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
@@ -58,7 +58,8 @@ src_prepare() {
src/goocanvas/src/Makefile.am src/goocanvas/src/Makefile.in \
|| die
- epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-underlinking.patch
cp /usr/share/gettext/config.rpath .
eautoreconf
sed -i \