summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-10-26 20:04:29 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-10-26 20:04:29 +0000
commit4e3e547f284f83587b5cd03b39f376e44fffa10e (patch)
tree1bc1c4cede5936329f81dc6eb6f5bebfc8ce6fbc /games-kids
parentfix underlinking wrt #484434 (diff)
downloadhistorical-4e3e547f284f83587b5cd03b39f376e44fffa10e.tar.gz
historical-4e3e547f284f83587b5cd03b39f376e44fffa10e.tar.bz2
historical-4e3e547f284f83587b5cd03b39f376e44fffa10e.zip
fix underlinking wrt #488964
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-kids')
-rw-r--r--games-kids/gcompris/ChangeLog6
-rw-r--r--games-kids/gcompris/Manifest19
-rw-r--r--games-kids/gcompris/files/gcompris-12.11-underlinking.patch18
-rw-r--r--games-kids/gcompris/gcompris-12.11.ebuild5
4 files changed, 43 insertions, 5 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/Manifest b/games-kids/gcompris/Manifest
index 3b470df458f2..a6fc2831ff17 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX gcompris-12.11-build.patch 4287 SHA256 5dc68273de5a8a998d39c70110a80bea2870b941f133c86f8323dc19c09f3dd9 SHA512 54564c502b29f955b406e2652335d72a8fd6162ab0837a9f29cfe01c60583a87a1ec53e325ed7a70a7d1538413d01aa5d6336d00ad6b1a9b6897cae0edddba44 WHIRLPOOL 7f20d717a777c62fdb5f790356d0f8a8c183f9496fee350000ad1310b98b738ff71eff8c8d4b17b3cccd7874f79277e9da93f84c2a7bd3e24bba4feea8ce964b
+AUX gcompris-12.11-underlinking.patch 444 SHA256 734387cb438ab31d6735cec3718c7249c58e5906f588b113efa92a22ec8745c8 SHA512 a051ad5775d417804ca47885a6d0d07f11e053afcc670c8d4c75e37841ace308bfb54772ac6399e2b8cc84000c26a294e40aef97c7f0123a451dd48a22e52138 WHIRLPOOL 7ba523ccbd6f6544842b24f33ad563b85e543070bd004936a4ddc836201ee824e2cd49466ae3019c34ba8a5fc8a3c5893afc0e7a6f24bc3f83c67de291cc14c0
DIST gcompris-12.11.tar.bz2 167528452 SHA256 97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20 SHA512 f60e9c3a5e4d781fb550b628d46f6af582a1a7de67271699b6f2abdc905250efca31d444b4cf3aa63044f7183fc8139d68849850738098d766bf5ff3fcc08916 WHIRLPOOL 9a0888b510dd5f23864f30fd1eb10ab8c140ce75f745c5705a28a72d41780259e726c74183e828fd6a04ad4caf3321ae7afc0322909e03a6b8b1a7faf93a329b
-EBUILD gcompris-12.11.ebuild 2295 SHA256 390f98592fd84b4b6cd8767a80f3442799b11e7ff4e55da597eda60febee0405 SHA512 f6150d1ea18260c2f46ee9f81c11c876cee063e60bc300cca821704ee9a6e0f62f61bb43124e5713953cc668b88f047609419a0aa3c54c3447d11444759e643f WHIRLPOOL 20dd3636209223ad2bbec719e6d2da94f0583381fa74067f2882005157ebbaf9c6e931d1eb9b8c05ca3c225483a3145ca1dc8aa4d6bff6f0060f84bc53f22dc2
-MISC ChangeLog 13637 SHA256 d181317e15ae30ae91b87ce605f282740a41a3b83b5bcddd41544d6d10f3f5a4 SHA512 7fb29169cd7ccb07426991fe0fe9fffee01ff8c1d6a1b76387c564cd7506a041b0e521f4f334934e8c376e494daaaab8bef199ab1a5db3746088b94e279764ea WHIRLPOOL c215b4531adaf988160657e47858912186b39bd6cfd863e64adb5a838687c965d2b6a87da1a7c1d8c2ddb1799d536851197ea3ed29e70f167a2625230615b9e1
+EBUILD gcompris-12.11.ebuild 2336 SHA256 dba0f72fa03e9d592bcd6ddf7642548fc267aed890661b335e91993c8e8e2700 SHA512 e3dcc9ab7f135d4c471e57e7fdfdf4fe1b6e27ecbe4f7024d96084671491b3d9e75d1c774c3ecbc45f9d9df8bf369f26fb800ae800e9eeded9b8cdf651943e62 WHIRLPOOL cc43e8c1184689575d8e9011b38c65975888bcf542ca9b4838166e3e190d67c05d678533b6e763ea964fd36c7670a4c3a6e40bdd24482b1a9e21271ae19197ec
+MISC ChangeLog 13786 SHA256 c78a12bbb9eb39d20ec9eafcf5d60b6933e56887293a6b3cd702de46abccee70 SHA512 d3fee040b39d2c6905ce21addf9c9457ce8aef55b446dde88720ee97cfad4db0713d0acfa2026956ff3c3f1735bd7bc12457f2a3c98603d3a0021d2e1081fab8 WHIRLPOOL af280c9aeebc850fc76049a63a69629ea84240b40c839aceb2c2502eef3aac85db0948494140f4b8a3e25c8c1aa968092598a8661fe009b3c154e8ce5f279544
MISC metadata.xml 160 SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d SHA512 e5ae2b384aa96a402995bf0e8b4c29d38d57f1ebc44eeca71d7eda9a29431b7737c3c3a5df053e868a21c21abb457658344e7fb7c2102d4625a160273048c2db WHIRLPOOL b626c8afedc54ba9adb429cb53f860c0165702b1cea15f5c84c4e458cc94f28755ec66c5b73d9ecc155c1de70c82e1d79ba859c2124d0a78437681f2786e1246
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSbCBOAAoJEFpvPKfnPDWzj+UIALNokJRnSjJVMvJ1XLre9RuZ
+zBy608hB4Ze7TC0FfqjZetSMYl6LhnSlvdQP5YC2IqBrQLu4xD0BzgAdvZ9uFePR
+NYBTtS74bNMmkh1F46a1Q0bqeW8ii6UYGS5s9BxCbYcnbWaySlr8LkMTXxWAdEnJ
+tqB/wz8tUJ6EIy80BIkyN9x35/b/aJo+82iWBrF/7RqYe+yePelRiOFh4HyMraZE
+h5Wp48F3PSfH8h4HcGHydKt4dhKvbyS37QkYFbB9BZf2VpOTFlqD+gnaTnxLIn4R
+DNbPuw7j0ETr4w5oE+oe57gNPWYDNeNcPw4C4gSq3ekA4ecEe3Z+ojCMaRobQRk=
+=S0vX
+-----END PGP SIGNATURE-----
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 \