Add fix for underlinking (https://bugzilla.gnome.org/show_bug.cgi?id=724104)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 100 insertions, 10 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index df944442c124..33e9c90df0ca 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.196 2014/02/09 20:28:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.197 2014/02/11 08:32:02 jlec Exp $
+
+  11 Feb 2014; Justin Lecher <jlec@gentoo.org>
+  +files/glade-3.16.1-underlinking.patch, glade-3.16.1.ebuild:
+  Add fix for underlinking (https://bugzilla.gnome.org/show_bug.cgi?id=724104)
 
 *glade-3.16.1 (09 Feb 2014)
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index a56a2e179590..0dfd336e944b 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX glade-3.12.1-doc-version.patch 1416 SHA256 224a3aca9c9bcd190798a702f603a186155784d207720606ec2c89cc5152bb48 SHA512 1a630851cf12df54ce68feeb71343f1e7e56df25d8c1c31192307e4f19124a88293428362f35f59ca37cc116c26ce32e8c521415b93e47112f3d513b3afc9e56 WHIRLPOOL 7e860b824ef0aea4de6382dbf35acc1fb562eadcf46b27b04b1612b56fd968e73c9c5a5d862694a7aa100db084d2366575bdb12dfc32c0a4794ca6d91d672122
 AUX glade-3.14.1-doc-version.patch 853 SHA256 6fb39133bf00abd38f56b3a79cbd8b714a922cca231db59cd8dcb00693604fdf SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf WHIRLPOOL 2f5315144afc183db4599134a23ebab098df1708474180c27aaf4143cf5db5a70260bbfed756d00f54a35f37b6379134cb24f6567edaaff0a9bae72b19433f99
+AUX glade-3.16.1-underlinking.patch 2545 SHA256 eb0fb4b5566c903cf63b0c6cd22755115ecd83e83a7a4f1e93e53be5942694a0 SHA512 c099df4f717dec37f81bcc8d01b3c948e44fe9372c2828400df1d9f77527fbf78b93b487cf13efacba9f927b06ef235dc86ea7ba21a6be39cb7ac2ddb0180e9f WHIRLPOOL 149bf8226263e9d2a66f28f80f9a53c1d2d71da46a72fd0f38f1889eabb6825b64c616228d9b1d645c16af0d1525c559280344a6cf1aa214b5a7fe2d1f212d88
 DIST glade-3.12.2.tar.xz 2455892 SHA256 8a60ea06528a5994ee2c214faeb834d3dcbffcef2e14d77d55d0e883de8eb3a3 SHA512 000c43b8f74c916f0ee87be0fd4e99eacbd356066b21397004079f6f7241332ec3144477afc8dd39db001bcd6bd2b76edb57b9689d87041bd505912e8a597d5b WHIRLPOOL ca419a59f636771a3558d7c47192acc823fd0ed4628ec721c11df78e841c74196a172c0fb849d25900dbb24b54fa1ac1a561ffa82c9b0d4eaef318a3cd2727cf
 DIST glade-3.14.2.tar.xz 2480480 SHA256 d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6 SHA512 479665d3afbb7a699b6952d48d5fa9897f35d6c405e9d0288ce5a40f4f631b226eb234ebd7645df0d3bc3695d035ba860cf778faa471d7635e01f1b3b707bb5a WHIRLPOOL 48d358d2d4f364351ad2cc2923f489206b23a4d1cb17f3dfc3272234cebfff9fef1a2c5bb2ab6b3370b33c7983962aedf27655a7e6402d3e6250c65c85922742
 DIST glade-3.16.0.tar.xz 3053260 SHA256 b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626 SHA512 4a09746f2ca5a30b2550170c6dfec81f7d9d1694562ba877773ffe76583797fa601457b540058a512264fde0155e10b5b7e0ef3008272ee63b92c3a7fa05ae2a WHIRLPOOL 9daa6717e282ec9884c7254ef19f7db1138083e70d60615e4f6c09181fba64e87901de29d707b98f74646ed578cc9f1ddf0f673f4a10f4922220140a8bc469f2
@@ -12,15 +13,25 @@ DIST glade3-3.8.4.tar.xz 2305876 SHA256 c7ae0775b96a400cf43be738b2f836663a505b14
 EBUILD glade-3.12.2.ebuild 2307 SHA256 8209c1bc28dea816f63338c7ee0ca9b34e12063b7e817259c9d82ce984ccee14 SHA512 157b34c0842b5a78f51bf7fc53ac2191c2ee5c2cc0d7f2f7462f9aba3dc0560c397105f7cc288f473754ea424141914fcf9e537b1a0e604bc77bda2b2b683ebc WHIRLPOOL 5993edd897eb477a8aed10d4c81c53fd6ca35c738db0b87956d3bba44215ad872c99343f090e35485106b9ce2771a3bf9daad22eb3e1410448400849aaafa6b9
 EBUILD glade-3.14.2.ebuild 2343 SHA256 7c84ae1450424fd15201a0db49c4cbb132a18b4cc8ddcf08847db20728325dc0 SHA512 b08bd60987d14ffb1e6b6390d1c19ac8d5bfd09387b8443e1c703c9dab6340fd609d39e9db882417b88e7319d23ffe2859d9c689be943605adcb611c642caa87 WHIRLPOOL ab358f283eb6f7030e179c7e57b75aa7cd56782e928350480ca873b936a1c9a8b4c7694b532d949e7c354e08d6b0fa31d1675035e7d99f4ac99df682cfd9f63c
 EBUILD glade-3.16.0.ebuild 2384 SHA256 3acb3c17933cb8bc4b47ab9357d89228691b1e54f1100993327a67b9f3a85c2b SHA512 74c6b7cbec73467782efe2e9646935b4c17d6d61c141216f7431a3609f8399b2d7cdab21e5f9c7d578b16c48f4433f88d1e948431297bf1c4e26d91ae4cd3cce WHIRLPOOL e1637cbc0e8bcaf2428a794958286ae6906c14da2e26615642ea30833c1ea72aabcedf8d78221e5467ffe59bd2ed303f2056fd5c6cb05fb2f9d388c311b4e0ab
-EBUILD glade-3.16.1.ebuild 2384 SHA256 b0433460f82ac665c3795a1c1d6c9ad41b44c8409a74475e2a460f2befe1536b SHA512 b1a9b39c2fd09f21e47d47aa2d10b6736f745f1a78f2562c42108756d25c60a6e5568af4b4bcbb98bb221e3f1378e3cf6f6261dab669825c784a00cd548604bc WHIRLPOOL e8e0fe5fb5afdd0bf71ab26fb98ffeb8804003883f3be456ff737830fcd9998a9c0d5b08cc4f8ac1fc465127ce8da76214b13b335513d120afdab4cce7c65847
+EBUILD glade-3.16.1.ebuild 2455 SHA256 b01333f357a11c9315ebef1784f51f645dac9c4750dabf191bd1f1f48240cd71 SHA512 9711a2bab55f26fa138fbfee7c5647f521853a10ebbfeb9095acfb7bdf65f51705532727c06e2003b98da9a45e22331f72fbc03101a9969ec6be91587cf491c3 WHIRLPOOL 661926bd6ff9a73b8a7a1b87526c8104f6e558bc4e1794d65cc2f4b2bd99e643c9630e57fdb071398defaa62973260f6f21f15387089db47b3b1484e66864d1c
 EBUILD glade-3.8.3.ebuild 1478 SHA256 1c726cb00cad6015374b45f1c57c204e0ec471633037d9ce6dc769fa1f8b9c07 SHA512 fbd4d4a502b597d1bdc10dafdcb69e1493fc072b1d865edccfce8545cdbe2e279659d8760e2008282c46a4f1ce64a8a247d013848ea92c5dce8b2a6fdaddc9c0 WHIRLPOOL b7ff7874ec2f2327aab7c19195e5d7c8233ffb0f099c3f3000ff8b4a015dd150b07b255ec764aa1e85435ffe69e4de14540cba7bf23ca9f23365b53e805a14bb
 EBUILD glade-3.8.4.ebuild 1219 SHA256 20d0c3b562ea84fc183546222217cb3bdfc424290b6ce102cdf81d5ebfddc780 SHA512 8380c3be94f3f5aecfc5df95bfae125f2faaf5ad09ff1812bec4d7757a6f439dd302eac292e86ff0475241e7b1432c640f8aba8e1a7a47b62787ecc3c0a15bb6 WHIRLPOOL a7d1a6ca9c0e109ea857802ba624ae2fd9405250733141ba48ea4220c1fc0d42fa9d1d9fc9a691a63e3857fe11f99ae34433265eb1ef941f76b146f79c8b42f9
-MISC ChangeLog 25079 SHA256 4f4182b8123c21a3e56a570cb9ce4459b330b14cdb4368c8d79a898d8aafd760 SHA512 dfe753632ebf174935daee999125af5029d19f068149a35c318d679daeb2bec3842768af92513e1fc2ce8e5d85e13805032a61dd2c280c6c6b000489e8ed1091 WHIRLPOOL ecb0117e65154c26b966d24ead4ec68a37884ca3769606377dae4282e0e1dade0cf8ddef8533a25fd8c4ed6b8aa9b98165000c005abebc625b198977d6727d9f
+MISC ChangeLog 25270 SHA256 78855a41b38f4972ef532f3b26f730292796e528f817eed6a746e2210755def8 SHA512 ae976181617e2a1271f2d9bfa1e16d5698bd0c2248d614517744d03189258112d9201caab6c0dddae9396c97cb166b3496663b3c4c050028b7d0367ee3807494 WHIRLPOOL 17bd9cdafde1bf5f28205700934ad263e38ef7503f37cd4a04a54cba5fd30bf2e8500c7f72a1b49e5515c0cd14beb5c2e42320c496cfc7b05ca7b76585605905
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL35P0ACgkQ1fmVwcYIWAY1dACfaRhsM2H1YkapE6DU48bSqfhs
-lrcAn2wstJ4UG4AFOsULi07HpI2vqGgf
-=GYg4
+iQIcBAEBCgAGBQJS+eADAAoJELnU8jG9FVirDPwP/RLzJ6MglTFRwT25TGmVzN1D
+gH8SKejiR3tvchwmKBSD0a0HFvzff6dy+U1NO0B3tA5kJgOHPFOF0Q+MI5/VcG5d
+M1SmVTvf8CmNuEyOUWtE6dg2OeTchw/RuhmhlsY+BswOeBCqvj/3CVuGH+an/M3A
+VYmdGQjWd+OAkzyv8q6C7tRza66FNXiGkQl0Dw0I8jt4NAOWuxWhqmC8mUZH/P50
+rP3CMAMTHoFYSMCV5UJ09SpbyV/m+EMB1f2bVkH2fa4U6dqQxRU4jHtUfCISbQxp
+A8uNYHMgeM7/WW/RK3DdTi4P/49kQLnoeggD20CUMSP+6bKa5u1IbIMw8LRiEKwC
+StbaJtEIYZT/4XPlzNn5R4f44bnufyziHVJIuGdRNUSofbwjNjyWBcNHqVtmzaHx
+lBNdXICHNl6RPneYvKuQJiFOYTIf45oT9+W5w3TKlgwGvQeRm2z1Kr1g6VZtKf3r
+CD2brud/+Yr2k6gVTlghGtBLZVKE6a2gFbv6pwbMKTyI5Z6EV7KKaq+0UutqGEq4
+DIa3gjO8SgF2HFS8L6X3HRQUAjfNQTn5qZ6VQqVIwpaZc55tW8gfWiyBwHAlBoLL
+bWy0BIznwsbKB+lPw08NUidisrSQVdWcerigppLJ18VPgAlQCxoprudIqenQcfqd
+wlfarVGu1KvpEfVgj8Ys
+=KKXl
 -----END PGP SIGNATURE-----
diff --git a/dev-util/glade/files/glade-3.16.1-underlinking.patch b/dev-util/glade/files/glade-3.16.1-underlinking.patch
new file mode 100644
index 000000000000..b97426c2a6dc
--- /dev/null
+++ b/dev-util/glade/files/glade-3.16.1-underlinking.patch
@@ -0,0 +1,71 @@
+ gladeui/Makefile.am | 4 ++--
+ src/Makefile.am     | 2 +-
+ tests/Makefile.am   | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index 87d610c..8fc02a0 100644
+--- a/gladeui/Makefile.am
++++ b/gladeui/Makefile.am
+@@ -19,7 +19,7 @@ glade_previewer_CFLAGS =   \
+ 
+ glade_previewer_LDFLAGS = $(AM_LDFLAGS)
+ 
+-glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
++glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) -lm
+ 
+ glade_previewer_SOURCES = \
+ 	glade-previewer.c \
+@@ -263,7 +263,7 @@ introspection_sources = $(libgladeui_2_la_SOURCES) $(libgladeuiinclude_HEADERS)
+ Gladeui-2.0.gir: libgladeui-2.la
+ Gladeui_2_0_gir_INCLUDES = Gtk-3.0
+ Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
+-Gladeui_2_0_gir_LIBS = libgladeui-2.la
++Gladeui_2_0_gir_LIBS = libgladeui-2.la m
+ Gladeui_2_0_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gladeui-2.0.gir
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 89e597e..83dd436 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -18,7 +18,7 @@ glade_CFLAGS =           \
+ 
+ glade_LDFLAGS = $(AM_LDFLAGS) $(GMODULE_EXPORT_LDFLAGS)
+ 
+-glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
++glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) -lm
+ 
+ BUILT_SOURCES = glade-resources.c glade-resources.h
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index fc96195..3099186 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -28,7 +28,7 @@ progs_ldadd = $(top_builddir)/gladeui/libgladeui-2.la
+ create_widgets_CPPFLAGS = $(progs_cppflags)
+ create_widgets_CFLAGS   = $(progs_cflags)
+ create_widgets_LDFLAGS  = $(progs_libs)
+-create_widgets_LDADD    = $(progs_ldadd)
++create_widgets_LDADD    = $(progs_ldadd) -lm
+ create_widgets_SOURCES  = create-widgets.c
+ 
+ # Test that various types of container widgets
+@@ -37,7 +37,7 @@ create_widgets_SOURCES  = create-widgets.c
+ add_child_CPPFLAGS = $(progs_cppflags)
+ add_child_CFLAGS   = $(progs_cflags)
+ add_child_LDFLAGS  = $(progs_libs)
+-add_child_LDADD    = $(progs_ldadd)
++add_child_LDADD    = $(progs_ldadd) -lm
+ add_child_SOURCES  = add-child.c
+ 
+ TOPLEVEL_ORDER_FILES = \
+@@ -63,7 +63,7 @@ toplevel-order-resources.c: $(TOPLEVEL_ORDER_FILES)
+ toplevel_order_CPPFLAGS = $(progs_cppflags)
+ toplevel_order_CFLAGS   = $(progs_cflags)
+ toplevel_order_LDFLAGS  = $(progs_libs)
+-toplevel_order_LDADD    = $(progs_ldadd)
++toplevel_order_LDADD    = $(progs_ldadd) -lm
+ toplevel_order_SOURCES  = \
+ 	toplevel-order.c \
+ 	toplevel-order-resources.c
diff --git a/dev-util/glade/glade-3.16.1.ebuild b/dev-util/glade/glade-3.16.1.ebuild
index 89883ff6c190..5838c88a83da 100644
--- a/dev-util/glade/glade-3.16.1.ebuild
+++ b/dev-util/glade/glade-3.16.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.16.1.ebuild,v 1.1 2014/02/09 20:28:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.16.1.ebuild,v 1.2 2014/02/11 08:32:02 jlec Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils gnome2 python-single-r1 versionator virtualx
+inherit autotools eutils gnome2 python-single-r1 versionator virtualx
 
 DESCRIPTION="A user interface designer for GTK+ and GNOME"
 HOMEPAGE="http://glade.gnome.org/"
@@ -48,7 +48,11 @@ pkg_setup() {
 src_prepare() {
 	# To avoid file collison with other slots, rename help module.
 	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	epatch "${FILESDIR}/${PN}-3.14.1-doc-version.patch"
+	epatch \
+		"${FILESDIR}/${PN}-3.14.1-doc-version.patch" \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf
 
 	gnome2_src_prepare
 }