summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-kids')
-rw-r--r--games-kids/gcompris/ChangeLog7
-rw-r--r--games-kids/gcompris/Manifest5
-rw-r--r--games-kids/gcompris/files/gcompris-8.4.5-redhat.patch12
-rw-r--r--games-kids/gcompris/gcompris-8.4.5.ebuild6
4 files changed, 25 insertions, 5 deletions
diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index c8b78fc7a30b..ad9cfa2d9d95 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-kids/gcompris
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.40 2008/06/10 06:14:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.41 2008/07/21 15:54:02 mr_bones_ Exp $
+
+ 21 Jul 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/gcompris-8.4.5-redhat.patch, gcompris-8.4.5.ebuild:
+ fix start up problem with patch from redhat, pointed out by Pacho Ramos in bug
+ #225883
*gcompris-8.4.5 (10 Jun 2008)
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 79ce03145b45..1381895d1985 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,10 +1,11 @@
AUX gcompris-8.4.4-build.patch 5212 RMD160 286b2f45252715f604d25d70df3e752364881eee SHA1 888c0bc21665ba934ab276c7ae058ccafe963e37 SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806
AUX gcompris-8.4.5-build.patch 5212 RMD160 286b2f45252715f604d25d70df3e752364881eee SHA1 888c0bc21665ba934ab276c7ae058ccafe963e37 SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806
+AUX gcompris-8.4.5-redhat.patch 509 RMD160 fe397f33eeb2a982fc4fd6e7b4a00e0c538e737b SHA1 aaa5e256ca820c0609a047e2f861e5d749474dd0 SHA256 af5925467eb2f2c3d7050ade5c997af2645a880408f5dd2bbd15f077c3071e35
DIST gcompris-6.5.3.tar.gz 43519786 RMD160 7e17a5ad1c2a7f2236b6cf730a7eddadc38281be SHA1 0bcf89cac9c464fcd3cb2dc82b46f49d862f3c1f SHA256 78bc8932160ccd1db78d5431675034a3b0bbe695371276ca01fe6ae49d35ffa1
DIST gcompris-8.4.4.tar.gz 88822523 RMD160 ed5010bc898b87db0918d5c5e1fcd2972f0d18ed SHA1 a93e58d7b281c5840ec35417211469fff9462be4 SHA256 c5228cc402752c15479446bc8fe08ed5ef60fa195989c271c1f2ac156ef644a2
DIST gcompris-8.4.5.tar.gz 87273887 RMD160 a367cbb2e099149483a043bda1ab300b8ab5e543 SHA1 50f8e1156907cbfdfa50be2fdc90754771eb6623 SHA256 f5ed7876271b8ba5892945ba6cf573210768d97c94327a39e7b6cc4dc9bd5e5d
EBUILD gcompris-6.5.3-r1.ebuild 1577 RMD160 ceeb3585669cd63e0071b0f6ef6f92d545518cfa SHA1 fc9d05c639874978a6cf18881390a27162f4d9bc SHA256 7504452c3ad33d7d4d53f6ea945f5223d277e659ff50ba56e9b65472af4b92b7
EBUILD gcompris-8.4.4.ebuild 1790 RMD160 b6c60acef32f96d84e8d29fc31b4161c9066c93d SHA1 3f4431204455c9582e728d9ce842c408f68c81f0 SHA256 a047f76c63db4c56e4f566eeab63aec173694f7d2b8d202b44a59dd9848abd3f
-EBUILD gcompris-8.4.5.ebuild 1864 RMD160 59dfc6cf32de22e6560feba19fb79c548bd45d06 SHA1 b7e8fa7d02dc531ccd2db91bafa2695d7cb48879 SHA256 a9f980d91da1d37d0b68fb824130e07d4fb8e59055fb1eaf681ac7d441d17ab5
-MISC ChangeLog 5973 RMD160 d6d21876779344a2354bb599d12b9f2e1bc29fbe SHA1 5849d669ce7080e528ec27b01b60d71e17f7f46c SHA256 c51587c22bbaa3c76a2231323d105f687bad676be807253c3be3c72cad7a2dae
+EBUILD gcompris-8.4.5.ebuild 1904 RMD160 0db6808d009f485f7f8bf9fd24f652d6f67fb430 SHA1 426cec8d2bbf7f57bd7ef30c3ec04317ef9fdea4 SHA256 9d4f09a0171bbfd1c7feda01a7b6c7792a9a35f7628292a8b8ac178a7a53f75f
+MISC ChangeLog 6181 RMD160 e5ab970ce552ca19d04d3880ca9852ae6a1fa867 SHA1 350d4a4124c908130cf922ec4d95acc5f863cdb5 SHA256 aeff14b5203a35e28ba532460458ad21015a67c654f1bc052b4c1fd5b1f99c8d
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-kids/gcompris/files/gcompris-8.4.5-redhat.patch b/games-kids/gcompris/files/gcompris-8.4.5-redhat.patch
new file mode 100644
index 000000000000..85e2945d9757
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-8.4.5-redhat.patch
@@ -0,0 +1,12 @@
+diff -up gcompris-8.4.5/src/gcompris/gcompris.c~ gcompris-8.4.5/src/gcompris/gcompris.c
+--- gcompris-8.4.5/src/gcompris/gcompris.c~ 2008-05-29 23:22:33.000000000 +0200
++++ gcompris-8.4.5/src/gcompris/gcompris.c 2008-05-29 23:22:33.000000000 +0200
+@@ -1127,7 +1127,7 @@ static void load_properties ()
+ #ifdef NSBUNDLE
+ exec_prefix = gcompris_nsbundle_resource ();
+ #else
+- exec_prefix = gbr_find_exe_dir("");
++ exec_prefix = gbr_find_exe_dir(NULL);
+ #endif
+ g_warning("exec_prefix %s\n", exec_prefix);
+
diff --git a/games-kids/gcompris/gcompris-8.4.5.ebuild b/games-kids/gcompris/gcompris-8.4.5.ebuild
index e6415161d601..5cceed3f46c1 100644
--- a/games-kids/gcompris/gcompris-8.4.5.ebuild
+++ b/games-kids/gcompris/gcompris-8.4.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.5.ebuild,v 1.1 2008/06/10 06:14:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.5.ebuild,v 1.2 2008/07/21 15:54:02 mr_bones_ Exp $
inherit autotools eutils python games
@@ -45,7 +45,9 @@ RDEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-build.patch
+ epatch \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-redhat.patch
cp /usr/share/gettext/config.rpath .
eautoreconf
}