diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-21 11:43:36 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-21 11:43:36 +0000 |
| commit | 332e64195947cc2f3f6adfe7fb9344219600b15c (patch) | |
| tree | aa76a3a34267c26ba3cf81bed61e8d452bd4b734 /games-kids | |
| parent | Respect CXX,LDFLAGS. Bug #341875. Thanks to Diego E. 'Flameeyes' Pettenò <fl... (diff) | |
| download | historical-332e64195947cc2f3f6adfe7fb9344219600b15c.tar.gz historical-332e64195947cc2f3f6adfe7fb9344219600b15c.tar.bz2 historical-332e64195947cc2f3f6adfe7fb9344219600b15c.zip | |
Remove GTK_DISABLE_DEPRECATED allowing build with x11-libs/gtk+-2.22. Bug #341813
Package-Manager: portage-2.1.9.20/cvs/Linux i686
Diffstat (limited to 'games-kids')
| -rw-r--r-- | games-kids/gcompris/ChangeLog | 7 | ||||
| -rw-r--r-- | games-kids/gcompris/Manifest | 15 | ||||
| -rw-r--r-- | games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch | 10 | ||||
| -rw-r--r-- | games-kids/gcompris/gcompris-9.2.2.ebuild | 5 |
4 files changed, 22 insertions, 15 deletions
diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog index 40e10c10b96d..8853a362633f 100644 --- a/games-kids/gcompris/ChangeLog +++ b/games-kids/gcompris/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-kids/gcompris # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.55 2010/08/12 04:00:50 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.56 2010/10/21 11:43:36 tupone Exp $ + + 21 Oct 2010; Tupone Alfredo <tupone@gentoo.org> gcompris-9.2.2.ebuild, + +files/gcompris-9.2.2-gtk2.22.patch: + Remove GTK_DISABLE_DEPRECATED allowing build with x11-libs/gtk+-2.22. + Bug #341813 by flameeyes@gentoo.org 12 Aug 2010; Joseph Jezak <josejx@gentoo.org> gcompris-9.2.2.ebuild: Marked ppc stable for bug #318633. diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest index fc253b0549e3..e8ccad92f567 100644 --- a/games-kids/gcompris/Manifest +++ b/games-kids/gcompris/Manifest @@ -1,18 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gcompris-8.4.12-build.patch 9403 RMD160 c50b64ac6b24ac7747ab26650949693fb2f0c6a4 SHA1 97e557c716073e5392ce30a7719a25cd917e8793 SHA256 ab6796e44b9dfe6e6f80f11f2dce1deee5debf6011c3c5a82d2fdd80fc9901ac AUX gcompris-9.2.2-build.patch 5001 RMD160 0e8f39b8f6ff277fbebf556c8bc8a3225e9153a2 SHA1 7709aa163a9ec84eb8c128502b65fbb153e0fde8 SHA256 945c075efbb27ac641cf4446305bd642c9734df849af9e830c070fda36c96ba7 +AUX gcompris-9.2.2-gtk2.22.patch 454 RMD160 8384e61b014d8ba6e34df8e9365be804e75d029d SHA1 4ec93d010eb6e558a6a31d4ccf6cc984ec812ba5 SHA256 e72baa1d6753aba2d256f0b63f3effd84871f51ddb5f3b43899ff4b09c1fd439 DIST gcompris-8.4.12.tar.gz 104355638 RMD160 f5d8129d4c37c97c1f15d0b7fb6865d3477b745e SHA1 55b6619d7e05fcfa0934c8564d8085d5aa880bbe SHA256 55025808dcb4afb3fa9ea8e232684e651da3ac2c673cb36592d6583ebec2d4c7 DIST gcompris-9.2-2.tar.gz 123861044 RMD160 2c1571a7ad18f31f54f80b574e66d0e9dbe77ba4 SHA1 584b7b65de0278ebabf5ccebe3644c0575150337 SHA256 6390b56ad3f7394b81818ad2194c5e65bbd9626cb0c0d0e0838c15beb5c1bfc9 EBUILD gcompris-8.4.12.ebuild 1859 RMD160 8ed7322a421d59b959ff10bbe3480eeaf678ae1c SHA1 21ad4dcec376068b79169a8c0f9e0dc6fee7e3d1 SHA256 529d0c6caeb0989fdf20ff3a25ed1bd716826722645e6dcfeb82160b20d47a7a -EBUILD gcompris-9.2.2.ebuild 2610 RMD160 07dbef7997310de82d4c7fe639c8e447a0c43697 SHA1 cf87b57c7762a21e82a9977d7d3774efc47f047e SHA256 e4960b8783a86a604bb177a7cc341ce5d813218062f3f96713aee6c13d7e5239 -MISC ChangeLog 8214 RMD160 11b08a73d9915cd76a1905023e3d32db5d9ef730 SHA1 9c2fdb08006357d2cd655838ed166ade973a393a SHA256 afb481dac0dfd92b665887c8191c09ab6c5dcfd888553ce6cccc71d72d2ee6a7 +EBUILD gcompris-9.2.2.ebuild 2647 RMD160 9100c3603592021b6b16209f68a271b467dda194 SHA1 2e98bf3193287f87016154e09790f139f41c3deb SHA256 6ecdc6f34007272208ed66b3323f8762f0e983dc1787363cfc67d68516821188 +MISC ChangeLog 8437 RMD160 e128f31ddbea890ac8d96af756ecfe15fa2dcae5 SHA1 e4c233b044e92e6b739ea0d4fb8051e20fff06a6 SHA256 bfa8071d4fa8538bc274b14907a12af3f0d0b3f96c5d60a6b55472186d763820 MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxjcaUACgkQcsIHjyDViGQ4LwCgtdBpoXIE1b+EhqY3sRtwYdu9 -IX0AoJHzsb3kwY7BrJwp/LfJKXRc7+AP -=ai6s ------END PGP SIGNATURE----- diff --git a/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch b/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch new file mode 100644 index 000000000000..662662f9d85b --- /dev/null +++ b/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch @@ -0,0 +1,10 @@ +--- src/goocanvas/src/Makefile.am.old 2010-10-21 12:29:13.000000000 +0200 ++++ src/goocanvas/src/Makefile.am 2010-10-21 12:30:14.000000000 +0200 +@@ -3,7 +3,6 @@ + INCLUDES = \ + -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DG_LOG_DOMAIN=\"GooCanvas\" \ diff --git a/games-kids/gcompris/gcompris-9.2.2.ebuild b/games-kids/gcompris/gcompris-9.2.2.ebuild index aee35b188735..e82a03df6ed7 100644 --- a/games-kids/gcompris/gcompris-9.2.2.ebuild +++ b/games-kids/gcompris/gcompris-9.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.7 2010/08/12 04:00:50 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.8 2010/10/21 11:43:36 tupone Exp $ EAPI=2 @@ -55,7 +55,8 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-gtk2.22.patch cp /usr/share/gettext/config.rpath . if has_version '>=x11-libs/gtk+-2.20:2' ; then sed -i \ |