From 8c405bd5c44ce37e4a712766c395f412e30e0717 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 17 Oct 2011 18:20:48 +0000 Subject: [PATCH] Fix linking with gold.ld Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64 --- app-text/evince/ChangeLog | 6 ++++- app-text/evince/Manifest | 17 +++++++------- app-text/evince/evince-2.32.0-r3.ebuild | 5 ++++- .../evince/files/evince-2.32.0-gold.patch | 16 ++++++++++++++ app-text/evince/metadata.xml | 22 +++++++++---------- 5 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 app-text/evince/files/evince-2.32.0-gold.patch diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index 9af962e03139..926b5674ab12 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/evince # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.228 2011/10/05 17:11:36 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.229 2011/10/17 18:20:48 jlec Exp $ + + 17 Oct 2011; Justin Lecher +files/evince-2.32.0-gold.patch, + metadata.xml, evince-2.32.0-r3.ebuild: + Fix linking with gold.ld 05 Oct 2011; Kacper Kowalik evince-2.32.0-r3.ebuild: ppc/ppc64 stable wrt #369909 diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 52eb4edccdc2..d23e107d84da 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,9 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d AUX evince-2.32.0-dvi-CVEs.patch 3386 RMD160 af5b7e0f74566716b86974a1e2efc34e1b925be5 SHA1 3c4084017e790ed5f0a1a422c1c742e97f89918f SHA256 49d1ed8adc734a005d4d8fdc1912bb115d97f734071d64bcae0aae60f2b5626a AUX evince-2.32.0-dvi-security.patch 816 RMD160 e1183dbeac1e404098d042a2ef87cbdce6d075da SHA1 c557404ba9dbc56e6d02d41b6969fa4dcc558616 SHA256 86e1e3ae2af8471896594b063726d6e7390169c443864b11797b7e3b937caea8 +AUX evince-2.32.0-gold.patch 445 RMD160 33f5c8b593ef7b8064111d74326c6abd3e211a46 SHA1 084160c0351907cb66f95984fcb72b8f10cd3af7 SHA256 5bfa37ed69f0754b8b9e9475c4f71e8b0a7b3b32925d72fb2e64f6efd69d693c AUX evince-2.32.0-libdocument-segfault.patch 1388 RMD160 be7abf45994904b6a5f5d2bc2a95574b7d7cf9f9 SHA1 af144209e2064397f53eae5fab6d8597a67d8cf3 SHA256 e9889a7920a8e6bd16b168333d120dfff1a2a2fcfed559d0d2f3678d9d234e74 AUX evince-2.32.0-libview-crash.patch 1351 RMD160 df5edf3bd00eaf43a07f56589eef3b3cbd8cdd2b SHA1 7e8329057745d58f8a607f4e71a7cf4d0a53dbb3 SHA256 f549f4b8bfa8078764d3fb11c3b8e3d9e9c7bc59ebc7e96ef9d6e63c35d3d35c AUX evince-2.32.0-pk-fonts.patch 1005 RMD160 bf3db4170d868ed72887e9ab83e031d4184c667b SHA1 77080e8546fed686b8bdb30f6290267a99daec09 SHA256 a8eba65d0a00fae77d85fec202b60762afa82a71695119a66f24a4ab0974fc82 @@ -15,16 +16,14 @@ AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c470 DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 DIST evince-3.0.2.tar.bz2 3016468 RMD160 b62472088a283e0d2675a04b65b3c8f204b8d540 SHA1 e87435d6cb42b9663c414691603bdfb426dfe640 SHA256 03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97 EBUILD evince-2.32.0-r2.ebuild 3834 RMD160 929684ca7149e1c47220d8fd46b4a4b3f4314a94 SHA1 67b0efc15d2f38b16d295f2b9c00d54a0423ecfb SHA256 2ec1e71428c961ce2c8caf456764380e7dfb24f9d8043cb4630f99aec1826337 -EBUILD evince-2.32.0-r3.ebuild 4089 RMD160 ddaf00ada14444063fb0edcb4655af12d1808104 SHA1 7994234f98960e966eee8c2e3425ce7bc0f37218 SHA256 73d753850ec2bda7f206cba85202017887e385957ad0ae5370f20e7577f20052 +EBUILD evince-2.32.0-r3.ebuild 4152 RMD160 7c723d0666e599806e8352fda6a36db55680e0ba SHA1 614bfae6dcd1c5081bb96432f9ce0b48919bb84d SHA256 fa06ef00327cf19e578648844a60742eb9fc93d2133c33c7f2995648c6f43e83 EBUILD evince-3.0.2.ebuild 3075 RMD160 934565e59ad1e982a858ede2b619cc43ef060120 SHA1 76a174033806a2cd3626472ec6707588d6b1068c SHA256 9681412455f4af98adcbbbec3c32ce05c802326ef61462f1484a6b8fe845e7f2 -MISC ChangeLog 33324 RMD160 bb30b8fa879e6cc9440e93804171f358819b5a61 SHA1 e33a3845a2ca92d97ebeb822d45a67c3bac33576 SHA256 373480dbaa558fa9c8fbcbc94b33b25d1164d6dded540d38a1c4747d0650edbf -MISC metadata.xml 704 RMD160 86b7f170da9780a261a10f31ca336bc727511962 SHA1 76786146716c3d6ff74232b11f79a9258b82fa8b SHA256 c331692598dc31958f7913fd9948522a3b9c0335f0354bb58d990eeaf8052047 +MISC ChangeLog 33467 RMD160 5b866ff2316372d8ed1eb5b17a15f362f0cd728d SHA1 cf1d7537ddb2b9e812c956bc36fae2f1701e2ef5 SHA256 0c7a506e6568b26a71c0d77be4b1fd17b6b8677f978355b4ce8be56c8dffeea9 +MISC metadata.xml 710 RMD160 83aee317654e0eec4505a3537eed0ce8c096f9de SHA1 4d49e1c6b28462111d1c8e8324b8048156a0856a SHA256 d64c76ef68c1569f9b508ed6beba97e7f1a3051400e5e40d04daaa2ab76a140f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk6Mj84ACgkQIiMqcbOVdxRyuAP+NVkZfi+c+F51t8cUGTY32WwO -AvgIpbnbMLGqpTUjwpFFvzHJ0lELFn9DQem63bRFbNR314ke1gmPqwIlwqqK+Od4 -tqovaMOTqwyL9wl+DsSYGsqb/1Zz28k9F1nwlkcUAHXdB5tcS65awBdxEqZ+n/TM -1a4HmUgNpthvzoU5vOw= -=UA/O +iEYEAREKAAYFAk6cchAACgkQgAnW8HDreRYmmQCcDNz6Ex+kZAs+ci606J7yg0SD +UisAnRtTaoJ1KAdyPC9H1F/UCXUyKRiM +=59Jm -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-2.32.0-r3.ebuild b/app-text/evince/evince-2.32.0-r3.ebuild index 47b1761f72e0..4a0aee84211c 100644 --- a/app-text/evince/evince-2.32.0-r3.ebuild +++ b/app-text/evince/evince-2.32.0-r3.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/app-text/evince/evince-2.32.0-r3.ebuild,v 1.7 2011/10/05 17:11:36 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v 1.8 2011/10/17 18:20:48 jlec Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -125,6 +125,9 @@ src_prepare() { cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!" fi + # Fix underlinking with gold + epatch "${FILESDIR}"/${P}-gold.patch + intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf } diff --git a/app-text/evince/files/evince-2.32.0-gold.patch b/app-text/evince/files/evince-2.32.0-gold.patch new file mode 100644 index 000000000000..dc846dfa3227 --- /dev/null +++ b/app-text/evince/files/evince-2.32.0-gold.patch @@ -0,0 +1,16 @@ + thumbnailer/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am +index 171c00f..b060a97 100644 +--- a/thumbnailer/Makefile.am ++++ b/thumbnailer/Makefile.am +@@ -26,7 +26,7 @@ endif + + evince_thumbnailer_LDADD = \ + $(top_builddir)/libdocument/libevdocument.la \ +- $(FRONTEND_LIBS) ++ $(FRONTEND_LIBS) -lm + + schema_files = \ + evince-thumbnailer-dvi.schemas.in \ diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml index 624d962f12ef..c47f45d1e418 100644 --- a/app-text/evince/metadata.xml +++ b/app-text/evince/metadata.xml @@ -1,18 +1,18 @@ -gnome - - dang@gentoo.org - - - Enable the use of gnome-base/gconf to honour + gnome + + dang@gentoo.org + + + Enable the use of gnome-base/gconf to honour lockdown settings - Enable the built-in DVI viewer - Use dev-libs/gobject-introspection + Enable the built-in DVI viewer + Use dev-libs/gobject-introspection for introspection - Enable property page extension in gnome-base/nautilus - Enable the Type-1 fonts for the built-in DVI viewer + Enable property page extension in gnome-base/nautilus + Enable the Type-1 fonts for the built-in DVI viewer (media-libs/t1lib) - + -- 2.26.2