diff options
| -rw-r--r-- | gnome-base/libglade/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/libglade/Manifest | 16 | ||||
| -rw-r--r-- | gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch | 10 | ||||
| -rw-r--r-- | gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch | 4 | ||||
| -rw-r--r-- | gnome-base/libglade/libglade-2.6.4.ebuild | 55 |
5 files changed, 78 insertions, 16 deletions
diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog index 60c341187829..c75b7af0f688 100644 --- a/gnome-base/libglade/ChangeLog +++ b/gnome-base/libglade/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/libglade # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.122 2009/01/05 23:38:31 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.123 2009/03/18 23:59:37 eva Exp $ + +*libglade-2.6.4 (18 Mar 2009) + + 18 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org> + files/Makefile.in.am-2.4.2-xmlcatalog.patch, + files/libglade-2.6.3-fix_tests-page_size.patch, +libglade-2.6.4.ebuild: + Bump to 2.6.4. Code cleanup and build fixes for single includes. 05 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org> -libglade-2.6.1.ebuild, -libglade-2.6.2.ebuild: diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest index 921142b47b6c..4a6759df38a9 100644 --- a/gnome-base/libglade/Manifest +++ b/gnome-base/libglade/Manifest @@ -1,16 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1331 RMD160 d47a94fb8ef65dbb6974936e0284fc691dc9c54f SHA1 c8bf1cf951f32de6b2f05176cf197e3d4b0ca6f9 SHA256 e1bb6b353fcacb54948ecbb3886dfa8a9a199370bef53cf38868bf744f02f0a0 -AUX libglade-2.6.3-fix_tests-page_size.patch 370 RMD160 260e1116a6fe2fdfc42bf525ab9f6a258b85411d SHA1 20913ad146f3c9f7db71ddadfeb9877c65891a4f SHA256 9e7cf985bf07128da18b2e49d10e5d7cf1eaa8923fc6648e413249a210842b4a +AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1121 RMD160 335fdf3b35fd95e1a9b2b683d14a9f95b24af32c SHA1 33eda915f031f6797f393447d76b1d44da6886ae SHA256 a2132d94f5b5e234b905f4a629c1a3c54cf93fbd4a6dc791f5699a731c41a0fb +AUX libglade-2.6.3-fix_tests-page_size.patch 369 RMD160 5aea3a51f6619fddf324e27370643d413be9eab0 SHA1 aea59f9885b7dda8b636a87fc00ea92ed1880d27 SHA256 97342a2d5bdf561d145950f5609d96a097ed2903e6c229f671b15d7d704248f2 DIST libglade-2.6.3.tar.bz2 358989 RMD160 73b00932c5a5ea1dfa25b2677783f5e52202ce8e SHA1 0af8b3263f241d4495243282e64b9aa43fecb618 SHA256 ee9ffee149523aac49ddff37c0fbaa968b6ff9787fa841d65a7084201e46ab90 +DIST libglade-2.6.4.tar.bz2 356119 RMD160 516a43543e518a319ca9b35556ca1ac88e2ce8fb SHA1 8465851733b8a0efbe57c43efc0f140d8e2d2edb SHA256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec EBUILD libglade-2.6.3.ebuild 1506 RMD160 6038a124e25bd5d0a06877f56815885f0a36b422 SHA1 e9564980117be9a8085bed84193d9e6909765bed SHA256 9f1dc27aa7c67ab797581f43aafcb907e20cb9a904e0242cb34f75dddf298fe4 -MISC ChangeLog 14653 RMD160 97d0c64c7076907f657781e89bab6c687269dd45 SHA1 f504a3b23229217a007afa267015677590737aba SHA256 61dab881e857529a6de514f1c074ff72eea89943faa10b4e2ca6acb8cdd58a26 +EBUILD libglade-2.6.4.ebuild 1503 RMD160 3acef76bec50a15f2b222ef5308ea0fe32882f91 SHA1 2340bb1b90a60d2844d22d3d173c57be6688511c SHA256 59c8676f90c6002b0ed368b288a08f0c7787228faccde909c73f018ed59a765e +MISC ChangeLog 14927 RMD160 ef1f20363598e774112e544b043d3ec9cfd5c023 SHA1 a87db2808af2c8af492b85c35f8f31ca09dedebf SHA256 65c5081dcc1e6d4c073c50263f04f8e3c3f4cdb4cae75e27a4902c917d27a1c4 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.10 (GNU/Linux) -iEYEARECAAYFAklimf0ACgkQ1fmVwcYIWAYC2QCfbRNNANHynm1d5AhKoHQsOPv2 -cr0AoLp4S4m2g1SkESRvJVWs6l7KOTKM -=J4H9 +iEYEARECAAYFAknBiu8ACgkQ1fmVwcYIWAZC3wCfSkG8GRr+1u/PGezBcVC8dF1S +4uQAoIz4C/hO6UYxQuRseisGcurNT5x3 +=lRhn -----END PGP SIGNATURE----- diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch index 4cf6a0170c2e..059cdc20f794 100644 --- a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch +++ b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch @@ -1,6 +1,5 @@ -diff -ur libglade-2.4.1/Makefile.am libglade-2.4.1-patched/Makefile.am ---- libglade-2.4.1/Makefile.am 2004-11-11 18:56:13.000000000 +0800 -+++ libglade-2.4.1-patched/Makefile.am 2004-12-06 11:00:24.501734048 +0800 +--- a/Makefile.am 2004-11-11 18:56:13.000000000 +0800 ++++ b/Makefile.am 2004-12-06 11:00:24.501734048 +0800 @@ -24,7 +24,7 @@ if HAVE_XMLCATALOG @@ -10,9 +9,8 @@ diff -ur libglade-2.4.1/Makefile.am libglade-2.4.1-patched/Makefile.am uninstall-local: -$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) endif -diff -ur libglade-2.4.1/Makefile.in libglade-2.4.1-patched/Makefile.in ---- libglade-2.4.1/Makefile.in 2004-11-11 19:21:38.000000000 +0800 -+++ libglade-2.4.1-patched/Makefile.in 2004-12-06 11:00:49.786890120 +0800 +--- a/Makefile.in 2004-11-11 19:21:38.000000000 +0800 ++++ b/Makefile.in 2004-12-06 11:00:49.786890120 +0800 @@ -819,7 +819,7 @@ diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch index c26ff83d9c15..37c5b69e544c 100644 --- a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch +++ b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch @@ -1,5 +1,5 @@ ---- tests/test-libglade-gtk.glade.orig 2008-09-27 16:50:40.164242312 +0300 -+++ tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300 +--- a/tests/test-libglade-gtk.glade 2008-09-27 16:50:40.164242312 +0300 ++++ b/tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300 @@ -470,7 +470,7 @@ <upper>100</upper> <step>1</step> diff --git a/gnome-base/libglade/libglade-2.6.4.ebuild b/gnome-base/libglade/libglade-2.6.4.ebuild new file mode 100644 index 000000000000..a3487fed8f8a --- /dev/null +++ b/gnome-base/libglade/libglade-2.6.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.1 2009/03/18 23:59:37 eva Exp $ + +EAPI="2" + +inherit eutils gnome2 + +DESCRIPTION="Library to construct graphical interfaces at runtime" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="LGPL-2" +SLOT="2.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="doc" + +RDEPEND=">=dev-libs/glib-2.10 + >=x11-libs/gtk+-2.8.10 + >=dev-libs/atk-1.9 + >=dev-libs/libxml2-2.4.10 + >=dev-lang/python-2.0-r7" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog NEWS README" + +src_prepare() { + # patch to stop make install installing the xml catalog + # because we do it ourselves in postinst() + epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch + + # patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort + epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch" +} + +src_install() { + dodir /etc/xml + gnome2_src_install +} + +pkg_postinst() { + echo ">>> Updating XML catalog" + /usr/bin/xmlcatalog --noout --add "system" \ + "http://glade.gnome.org/glade-2.0.dtd" \ + /usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm + echo ">>> removing entries from the XML catalog" + /usr/bin/xmlcatalog --noout --del \ + /usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog +} |