From: Justin Lecher Date: Thu, 24 Nov 2011 15:09:45 +0000 (+0000) Subject: Patch against underlinking when using gold, #370121 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=00025c86b1ee69e93e8c042265717b7caad62af5;p=gentoo.git Patch against underlinking when using gold, #370121 Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog index d6b61654f5cb..6513cfeaa08d 100644 --- a/gnome-base/gnome-applets/ChangeLog +++ b/gnome-base/gnome-applets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-applets # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.344 2011/11/06 02:05:58 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.345 2011/11/24 15:09:45 jlec Exp $ + + 24 Nov 2011; Justin Lecher gnome-applets-2.32.1.1.ebuild, + +files/gnome-applets-2.32.1.1-underlinking.patch: + Patch against underlinking when using gold, #370121 *gnome-applets-3.2.1 (06 Nov 2011) diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index 07f80da5ad6c..f89e6df1e631 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX gnome-applets-2.32.1.1-dbus-fix.patch 823 RMD160 69013629c626942f870c723793f34582748b3226 SHA1 c58976ec2a4ccddd2f3fd44c35edaf044de74c28 SHA256 6c79b77aa731f82d9b7c9704e5c6d3cb06252eea3c2d21fa35245d2f02ca0346 AUX gnome-applets-2.32.1.1-libnotify-0.7.patch 1431 RMD160 4c8edc49404fa45ce8e0c079e4f900a3ed7b1c45 SHA1 137d8b6e9c4f279fea6f81bd6d91928d10e1f8cd SHA256 1e0b1f9545029bda0f4aadc28ef6eba34a5dbd1c3d1e5cec45627be7b0c32eda +AUX gnome-applets-2.32.1.1-underlinking.patch 3606 RMD160 4a9223719c2e3a96d54ce6d39f413dcdfa947d50 SHA1 89cc472c7b69387ed2e85f2ef9d748c1d260d5d7 SHA256 874b1b0656f6e0c94d76f255c2b7539bb123ecf72add770ce3c8ee3bbf8cbc75 DIST gnome-applets-2.32.1.1.tar.bz2 10083534 RMD160 50c8e169b02aa002917f4c6ea0f575522e3ae984 SHA1 6edc3aea2bd2198b2bdbdb1fa63b481f724c8fe2 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327 DIST gnome-applets-3.2.1.tar.xz 8032112 RMD160 35a99d55308a5292b5a4e8b1e073db730b35a3f4 SHA1 99fc40a80197edd84649b7d5243d2c8645a90104 SHA256 cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1 -EBUILD gnome-applets-2.32.1.1.ebuild 3621 RMD160 0f699a4581ec7c98aebcf29cbadf4c1adf62792c SHA1 5d30d5cc0af01021d040a6ed9581b8764082b9bd SHA256 58481aacfa0286598717389b093c54b70a78dee5f4bbc4e981fe60803ae6b1d4 +EBUILD gnome-applets-2.32.1.1.ebuild 3662 RMD160 7eb549a0fa3baaf1bdfbecda43fb9e680a0fc161 SHA1 0e48fefe20570aabad8a8fd1efa99f1e2f71615d SHA256 840d5befaf4a906ba952cf88f41a3620134e728fc78fda0762b725a198149520 EBUILD gnome-applets-3.2.1.ebuild 3578 RMD160 60aed9088a2b9fac816c2aa8c3f74d0eb61d8556 SHA1 f626457a3e53c3479b201f124b1818a773847d14 SHA256 5e0e59cabe41db8c6616d30dfc56c0c3a1d31cd99f739f0a8706b3045486ad14 -MISC ChangeLog 50060 RMD160 fb56eda1bddc9cd1f21d020227e4d6d3b52598a3 SHA1 b4a59511b997eef6ff02f906695f6d4477ffffd7 SHA256 d5d7519ad33a607dd6d84e303e0532a09f764cedb4b660d923d0a65ade2e4104 +MISC ChangeLog 50240 RMD160 e67c9a3d099c7877022b1e4537e20e723e38652f SHA1 90b5e06bbe0b85b251ba78d84978047a28a4f723 SHA256 71c16abeaeb888b2d978302234275e0a57091c02f5f2d29d93dfe4be2386b45e MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6164wACgkQdjK8w9WeBnDEngD+O8ESX+N+miERGASpdJA1RiBB -MFCE+786jgPmJ8tYUaEA/RK9WzdfpainGzgEr/rwG4H3oDZ7M+kx1cqX9x3nX3PZ -=Gu0X +iEYEAREKAAYFAk7OXj4ACgkQgAnW8HDreRYGfwCfQ+7jluORGgW0Ld9iIZDftVpJ +MuoAn0HzATlNOwYmYQnEwpQljwe4LimX +=H/RZ -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch new file mode 100644 index 000000000000..c8308ef46aaa --- /dev/null +++ b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch @@ -0,0 +1,117 @@ + geyes/Makefile.am | 2 +- + geyes/Makefile.in | 2 +- + multiload/Makefile.am | 3 ++- + multiload/Makefile.in | 1 + + stickynotes/Makefile.am | 3 ++- + stickynotes/Makefile.in | 3 ++- + trashapplet/src/Makefile.am | 3 ++- + trashapplet/src/Makefile.in | 3 ++- + 8 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/geyes/Makefile.am b/geyes/Makefile.am +index 7668b4c..18cd851 100644 +--- a/geyes/Makefile.am ++++ b/geyes/Makefile.am +@@ -16,7 +16,7 @@ geyes_applet2_SOURCES = \ + geyes.h + + geyes_applet2_LDADD = \ +- $(GNOME_APPLETS3_LIBS) ++ $(GNOME_APPLETS3_LIBS) -lm + + appletdir = $(datadir)/gnome-panel/applets + applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in +diff --git a/geyes/Makefile.in b/geyes/Makefile.in +index cfededa..afe87e2 100644 +--- a/geyes/Makefile.in ++++ b/geyes/Makefile.in +@@ -384,7 +384,7 @@ geyes_applet2_SOURCES = \ + geyes.h + + geyes_applet2_LDADD = \ +- $(GNOME_APPLETS3_LIBS) ++ $(GNOME_APPLETS3_LIBS) -lm + + appletdir = $(datadir)/gnome-panel/applets + applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in +diff --git a/multiload/Makefile.am b/multiload/Makefile.am +index 53b3147..8fe2b9f 100644 +--- a/multiload/Makefile.am ++++ b/multiload/Makefile.am +@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \ + multiload_applet_2_LDADD = \ + $(GNOME_APPLETS3_LIBS) \ + $(GTOP_APPLETS_LIBS) \ +- $(GNOMEDESKTOP_LIBS) ++ $(GNOMEDESKTOP_LIBS) \ ++ -lm + + schemasdir = @GCONF_SCHEMA_FILE_DIR@ + schemas_in_files = multiload.schemas.in +diff --git a/multiload/Makefile.in b/multiload/Makefile.in +index b86d621..bf13bd8 100644 +--- a/multiload/Makefile.in ++++ b/multiload/Makefile.in +@@ -395,6 +395,7 @@ multiload_applet_2_LDADD = \ + $(GNOME_APPLETS3_LIBS) \ + $(GTOP_APPLETS_LIBS) \ + $(GNOMEDESKTOP_LIBS) ++ -lm + + schemasdir = @GCONF_SCHEMA_FILE_DIR@ + schemas_in_files = multiload.schemas.in +diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am +index c279952..65f5502 100644 +--- a/stickynotes/Makefile.am ++++ b/stickynotes/Makefile.am +@@ -35,7 +35,8 @@ stickynotes_applet_SOURCES = \ + stickynotes_applet_LDADD = \ + $(GNOME_APPLETS3_LIBS) \ + $(LIBWNCK_LIBS) \ +- $(XML2_LIBS) ++ $(XML2_LIBS) \ ++ $(X_LIBS) + + builder_DATA = $(builder_files) + +diff --git a/stickynotes/Makefile.in b/stickynotes/Makefile.in +index 5442614..2e8167b 100644 +--- a/stickynotes/Makefile.in ++++ b/stickynotes/Makefile.in +@@ -413,7 +413,8 @@ schemas_in_files = stickynotes.schemas.in + @BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_LDADD = \ + @BUILD_STICKYNOTES_APPLET_TRUE@ $(GNOME_APPLETS3_LIBS) \ + @BUILD_STICKYNOTES_APPLET_TRUE@ $(LIBWNCK_LIBS) \ +-@BUILD_STICKYNOTES_APPLET_TRUE@ $(XML2_LIBS) ++@BUILD_STICKYNOTES_APPLET_TRUE@ $(XML2_LIBS) \ ++@BUILD_STICKYNOTES_APPLET_TRUE@ $(X_LIBS) + + @BUILD_STICKYNOTES_APPLET_TRUE@builder_DATA = $(builder_files) + @BUILD_STICKYNOTES_APPLET_TRUE@uidir = $(datadir)/gnome-2.0/ui +diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am +index 52da653..05ba024 100644 +--- a/trashapplet/src/Makefile.am ++++ b/trashapplet/src/Makefile.am +@@ -14,6 +14,7 @@ trashapplet_SOURCES = \ + + trashapplet_LDADD = \ + $(GNOME_APPLETS3_LIBS) \ +- $(GIO_LIBS) ++ $(GIO_LIBS) \ ++ $(X_LIBS) + + -include $(top_srcdir)/git.mk +diff --git a/trashapplet/src/Makefile.in b/trashapplet/src/Makefile.in +index f006b80..a6ee115 100644 +--- a/trashapplet/src/Makefile.in ++++ b/trashapplet/src/Makefile.in +@@ -320,7 +320,8 @@ trashapplet_SOURCES = \ + + trashapplet_LDADD = \ + $(GNOME_APPLETS3_LIBS) \ +- $(GIO_LIBS) ++ $(GIO_LIBS) \ ++ $(X_LIBS) + + all: all-am + diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild index 1d05f8074e2b..6a58bdff623a 100644 --- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.14 2011/03/27 10:15:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.15 2011/11/24 15:09:45 jlec Exp $ EAPI="3" GCONF_DEBUG="no" @@ -81,7 +81,9 @@ pkg_setup() { src_prepare() { gnome2_src_prepare - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + epatch \ + "${FILESDIR}"/${P}-libnotify-0.7.patch \ + "${FILESDIR}"/${P}-underlinking.patch # gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043 epatch "${FILESDIR}"/${P}-dbus-fix.patch