| 1 |
jlec 12/04/30 14:18:01 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog libglade-2.6.4.ebuild |
| 4 |
Log: |
| 5 |
gnome-base/libglade: Add fix for problems with glib-2.32 and gold linker, #414111 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 gnome-base/libglade/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libglade/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 2 Jul 2003 23:56:19 -0000 1.1 |
| 23 |
+++ metadata.xml 30 Apr 2012 14:18:01 -0000 1.2 |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
<?xml version="1.0" encoding="UTF-8"?> |
| 26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 27 |
<pkgmetadata> |
| 28 |
-<herd>gnome</herd> |
| 29 |
+ <herd>gnome</herd> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.136 gnome-base/libglade/ChangeLog |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/ChangeLog?rev=1.136&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/ChangeLog?rev=1.136&content-type=text/plain |
| 38 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/ChangeLog?r1=1.135&r2=1.136 |
| 39 |
|
| 40 |
Index: ChangeLog |
| 41 |
=================================================================== |
| 42 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v |
| 43 |
retrieving revision 1.135 |
| 44 |
retrieving revision 1.136 |
| 45 |
diff -u -r1.135 -r1.136 |
| 46 |
--- ChangeLog 29 Sep 2011 16:50:18 -0000 1.135 |
| 47 |
+++ ChangeLog 30 Apr 2012 14:18:01 -0000 1.136 |
| 48 |
@@ -1,6 +1,10 @@ |
| 49 |
# ChangeLog for gnome-base/libglade |
| 50 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 51 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.135 2011/09/29 16:50:18 pacho Exp $ |
| 52 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.136 2012/04/30 14:18:01 jlec Exp $ |
| 54 |
+ |
| 55 |
+ 30 Apr 2012; Justin Lecher <jlec@g.o> libglade-2.6.4.ebuild, |
| 56 |
+ +files/libglade-2.6.4-gold-glib-2.32.patch, metadata.xml: |
| 57 |
+ Add fix for problems with glib-2.32 and gold linker, #414111 |
| 58 |
|
| 59 |
29 Sep 2011; Pacho Ramos <pacho@g.o> libglade-2.6.4.ebuild: |
| 60 |
Drop DEPRECATED flags, bug #384775 by Ian Abbott. |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.13 gnome-base/libglade/libglade-2.6.4.ebuild |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild?rev=1.13&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild?rev=1.13&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild?r1=1.12&r2=1.13 |
| 69 |
|
| 70 |
Index: libglade-2.6.4.ebuild |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v |
| 73 |
retrieving revision 1.12 |
| 74 |
retrieving revision 1.13 |
| 75 |
diff -u -r1.12 -r1.13 |
| 76 |
--- libglade-2.6.4.ebuild 29 Sep 2011 16:50:18 -0000 1.12 |
| 77 |
+++ libglade-2.6.4.ebuild 30 Apr 2012 14:18:01 -0000 1.13 |
| 78 |
@@ -1,13 +1,13 @@ |
| 79 |
-# Copyright 1999-2011 Gentoo Foundation |
| 80 |
+# Copyright 1999-2012 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.12 2011/09/29 16:50:18 pacho Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.13 2012/04/30 14:18:01 jlec Exp $ |
| 84 |
|
| 85 |
EAPI="3" |
| 86 |
GCONF_DEBUG="no" |
| 87 |
GNOME2_LA_PUNT="yes" |
| 88 |
PYTHON_DEPEND="2" |
| 89 |
|
| 90 |
-inherit eutils gnome2 python virtualx |
| 91 |
+inherit autotools eutils gnome2 python virtualx |
| 92 |
|
| 93 |
DESCRIPTION="Library to construct graphical interfaces at runtime" |
| 94 |
HOMEPAGE="http://library.gnome.org/devel/libglade/stable/" |
| 95 |
@@ -39,12 +39,18 @@ |
| 96 |
# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort |
| 97 |
epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch" |
| 98 |
|
| 99 |
+ # Fails with gold due to recent changes in glib-2.32's pkg-config files |
| 100 |
+ epatch "${FILESDIR}/${P}-gold-glib-2.32.patch" |
| 101 |
+ |
| 102 |
sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ |
| 103 |
glade/Makefile.am glade/Makefile.in || die |
| 104 |
|
| 105 |
if ! use test; then |
| 106 |
sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed" |
| 107 |
fi |
| 108 |
+ |
| 109 |
+ gnome2_src_prepare |
| 110 |
+ AT_NOELIBTOOLIZE=yes eautoreconf |
| 111 |
} |
| 112 |
|
| 113 |
src_test() { |
Archives