From a351d07c228ac4b96666d33d7b8fd19434062f33 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Sat, 17 Feb 2007 17:25:34 +0000 Subject: [PATCH] Fix linking against pilot-link with --as-needed; bug #154453 Package-Manager: portage-2.1.2-r9 --- mail-client/evolution/ChangeLog | 7 +++- mail-client/evolution/Manifest | 34 +++++++++++-------- .../evolution/evolution-2.8.2.1-r1.ebuild | 5 ++- .../evolution/evolution-2.8.2.1.ebuild | 5 ++- ...olution-2.8.2.1-pilot-link-as-needed.patch | 12 +++++++ 5 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 mail-client/evolution/files/evolution-2.8.2.1-pilot-link-as-needed.patch diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index a58936659c0f..ac5a852ae244 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/evolution # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.161 2007/02/08 12:26:36 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.162 2007/02/17 17:25:33 dang Exp $ + + 17 Feb 2007; Daniel Gryniewicz + +files/evolution-2.8.2.1-pilot-link-as-needed.patch, + evolution-2.8.2.1.ebuild, evolution-2.8.2.1-r1.ebuild: + Fix linking against pilot-link with --as-needed; bug #154453 *evolution-2.8.3 (08 Feb 2007) diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index 2ed0eab08fdd..e1cb85ea4199 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -29,6 +29,10 @@ AUX evolution-2.8.2.1-bf-junk.patch.gz 10431 RMD160 86f5a645ebbc69a757b6087e1718 MD5 dbf53f4869faead04a951a25d974805e files/evolution-2.8.2.1-bf-junk.patch.gz 10431 RMD160 86f5a645ebbc69a757b6087e17186f87d1953e4e files/evolution-2.8.2.1-bf-junk.patch.gz 10431 SHA256 a6b21ef3f465c8b10e1c0b07402ec3f0697432b70eac08b369ffe31f80f3c981 files/evolution-2.8.2.1-bf-junk.patch.gz 10431 +AUX evolution-2.8.2.1-pilot-link-as-needed.patch 594 RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 SHA1 af81da7f16b690fe634cc83a4b605b7453a3ff07 SHA256 fe54434610d0779328b2e8ad843342d347a6b1e0b0d077a1c19041dc63b08f57 +MD5 673ffa9d140881b086ec73c13d9abdc9 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594 +RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594 +SHA256 fe54434610d0779328b2e8ad843342d347a6b1e0b0d077a1c19041dc63b08f57 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594 AUX evolution-2.8.2.1-sig-handlers.patch 1357 RMD160 cd50a106b1e05831f21ac1aece2aa7a0e568738b SHA1 9d736d39ad6529469c6d52dcb5ba0e7e06ed9e5e SHA256 e983f8705959f2d52cb4259cbda4cc6892280265b29a0192189dec38e7e03fc6 MD5 7b85e3ca755762e4c060557cfd2124b9 files/evolution-2.8.2.1-sig-handlers.patch 1357 RMD160 cd50a106b1e05831f21ac1aece2aa7a0e568738b files/evolution-2.8.2.1-sig-handlers.patch 1357 @@ -41,22 +45,22 @@ EBUILD evolution-2.6.2-r1.ebuild 6101 RMD160 f5acd83e1712b26c8c762f68f80aafe9453 MD5 5e81f8102e75b4b27c4cfbe856f2b30d evolution-2.6.2-r1.ebuild 6101 RMD160 f5acd83e1712b26c8c762f68f80aafe94532ebaa evolution-2.6.2-r1.ebuild 6101 SHA256 f4aa7497d9cc6ad88352a9b7ad8607ad2788249e70cb3874995265147a3f4bc5 evolution-2.6.2-r1.ebuild 6101 -EBUILD evolution-2.8.2.1-r1.ebuild 6145 RMD160 50c2dc70a347c0d0168c96b2e2e88c310d111f95 SHA1 3213e98e99bd80baa173b39061470bf0b9c0e72f SHA256 73b3606ef4519dd31eb59815ce0cd81a1ba783cd7407e57657573e244f0edad7 -MD5 bd5f29241daa16ab809461bc6ccf2c14 evolution-2.8.2.1-r1.ebuild 6145 -RMD160 50c2dc70a347c0d0168c96b2e2e88c310d111f95 evolution-2.8.2.1-r1.ebuild 6145 -SHA256 73b3606ef4519dd31eb59815ce0cd81a1ba783cd7407e57657573e244f0edad7 evolution-2.8.2.1-r1.ebuild 6145 -EBUILD evolution-2.8.2.1.ebuild 6041 RMD160 4b927787f5e5d0b4fe69d4ca6c5797b840da1a78 SHA1 0100895d6036e077da690ffbc22cc05ed82654ba SHA256 8cc87d6817c6f26c5b0e9ef3539af34ebd74a5af2f61577b1b77a504b2165702 -MD5 1b90d5eac078bc2bed7afd1ed27be3d9 evolution-2.8.2.1.ebuild 6041 -RMD160 4b927787f5e5d0b4fe69d4ca6c5797b840da1a78 evolution-2.8.2.1.ebuild 6041 -SHA256 8cc87d6817c6f26c5b0e9ef3539af34ebd74a5af2f61577b1b77a504b2165702 evolution-2.8.2.1.ebuild 6041 +EBUILD evolution-2.8.2.1-r1.ebuild 6264 RMD160 794101a493cf479755a90af413fdf9ecf572cd5c SHA1 605233e633987af96e206c4ea521e3e8fb79da07 SHA256 1e8d9a6036b3bb42d05fb25f9e9ee2f4788f91f752e59c08838985bbf96636db +MD5 76fd0b46a2f2e57863c38dd64f410bcd evolution-2.8.2.1-r1.ebuild 6264 +RMD160 794101a493cf479755a90af413fdf9ecf572cd5c evolution-2.8.2.1-r1.ebuild 6264 +SHA256 1e8d9a6036b3bb42d05fb25f9e9ee2f4788f91f752e59c08838985bbf96636db evolution-2.8.2.1-r1.ebuild 6264 +EBUILD evolution-2.8.2.1.ebuild 6159 RMD160 459ee0470de24aeab8106314b1416f5562f489ba SHA1 1a7534faa0449d84e71d763d612b823125e13d26 SHA256 43ccc84cf00769f79f6f24064c2044bd3b96e25fd5178a0fb8dd6a5b38cce904 +MD5 9b36e03873213743c6804e164ed78d24 evolution-2.8.2.1.ebuild 6159 +RMD160 459ee0470de24aeab8106314b1416f5562f489ba evolution-2.8.2.1.ebuild 6159 +SHA256 43ccc84cf00769f79f6f24064c2044bd3b96e25fd5178a0fb8dd6a5b38cce904 evolution-2.8.2.1.ebuild 6159 EBUILD evolution-2.8.3.ebuild 6394 RMD160 ceac5e19c8f51cd9e62634adf277f3fb36b22b77 SHA1 32fe606b4e398efba5b7897a7cfad94dcfaeb9df SHA256 408d66d42a3dab96e74e987526c05031261a3832e59642f6d2ebb72a6d1ca4c7 MD5 4fd2eb6453c01104999b3adff65e54a3 evolution-2.8.3.ebuild 6394 RMD160 ceac5e19c8f51cd9e62634adf277f3fb36b22b77 evolution-2.8.3.ebuild 6394 SHA256 408d66d42a3dab96e74e987526c05031261a3832e59642f6d2ebb72a6d1ca4c7 evolution-2.8.3.ebuild 6394 -MISC ChangeLog 40634 RMD160 b78326837b2a964fe905e9e329ac05015d964452 SHA1 4dd9d8cc0e4e931eacdfd140a73a49222d37ceca SHA256 6e4d07c6c9947d263158baffe7ea7f529c8f4e5b4898c50b08c9d0e64f8e6366 -MD5 7bc6502002b43431f4c3dfb7d4b35f9f ChangeLog 40634 -RMD160 b78326837b2a964fe905e9e329ac05015d964452 ChangeLog 40634 -SHA256 6e4d07c6c9947d263158baffe7ea7f529c8f4e5b4898c50b08c9d0e64f8e6366 ChangeLog 40634 +MISC ChangeLog 40861 RMD160 12d4db57f9781b75df0a7a168c03b11f2bd8fa49 SHA1 b4b23bf2f7c5356b9d7b1468198204f0e600a1ef SHA256 7c539f96d9d8d8bd664e86c02112794162cdd4257376da596d122056ed3b0b73 +MD5 7806feafd3757194ae13729d9b2e5e64 ChangeLog 40861 +RMD160 12d4db57f9781b75df0a7a168c03b11f2bd8fa49 ChangeLog 40861 +SHA256 7c539f96d9d8d8bd664e86c02112794162cdd4257376da596d122056ed3b0b73 ChangeLog 40861 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228 @@ -76,7 +80,7 @@ SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFyxbqkeYb6olFHJcRAg38AJ0dGAVCO2Qf/oE7TLZDsB1YmbaskwCePKpo -aj0F9hozThvPhfZupO/60Hc= -=7dTE +iD8DBQFF1zp9omPajV0RnrERAoZ9AJ9qfsY2YH4IGY6X1AV0PYlH4xopegCdHvNd +Tdd5xphkEP/djazIjJ/ISeA= +=FWhO -----END PGP SIGNATURE----- diff --git a/mail-client/evolution/evolution-2.8.2.1-r1.ebuild b/mail-client/evolution/evolution-2.8.2.1-r1.ebuild index 24a2edeebbed..0232e72f738c 100644 --- a/mail-client/evolution/evolution-2.8.2.1-r1.ebuild +++ b/mail-client/evolution/evolution-2.8.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1-r1.ebuild,v 1.1 2007/01/30 19:05:05 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1-r1.ebuild,v 1.2 2007/02/17 17:25:33 dang Exp $ inherit eutils flag-o-matic alternatives gnome2 autotools @@ -158,6 +158,9 @@ src_unpack() { # Fix two images in preview crash; bug #163372 epatch "${FILESDIR}"/${P}-sig-handlers.patch + # Fix linking against pilot-link wiht --as-needed; bug #154453 + epatch "${FILESDIR}"/${P}-pilot-link-as-needed.patch + # Add bogofilter junk plugin source use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz diff --git a/mail-client/evolution/evolution-2.8.2.1.ebuild b/mail-client/evolution/evolution-2.8.2.1.ebuild index c88acec86b74..8f0a0ca6a0f1 100644 --- a/mail-client/evolution/evolution-2.8.2.1.ebuild +++ b/mail-client/evolution/evolution-2.8.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1.ebuild,v 1.9 2007/01/21 21:47:51 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1.ebuild,v 1.10 2007/02/17 17:25:33 dang Exp $ inherit eutils flag-o-matic alternatives gnome2 autotools @@ -155,6 +155,9 @@ src_unpack() { # Fix 64-bit warnings epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch + # Fix linking against pilot-link wiht --as-needed; bug #154453 + epatch "${FILESDIR}"/${P}-pilot-link-as-needed.patch + # Add bogofilter junk plugin source use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz diff --git a/mail-client/evolution/files/evolution-2.8.2.1-pilot-link-as-needed.patch b/mail-client/evolution/files/evolution-2.8.2.1-pilot-link-as-needed.patch new file mode 100644 index 000000000000..90663c5300ee --- /dev/null +++ b/mail-client/evolution/files/evolution-2.8.2.1-pilot-link-as-needed.patch @@ -0,0 +1,12 @@ +diff --exclude-from=/opt/home/dang/.diffrc -up -ruN evolution-2.8.2.1.orig/configure.in evolution-2.8.2.1/configure.in +--- evolution-2.8.2.1.orig/configure.in 2006-11-20 22:52:28.000000000 -0500 ++++ evolution-2.8.2.1/configure.in 2007-02-17 11:41:57.000000000 -0500 +@@ -577,7 +577,7 @@ if test "x$enable_pilot_conduits" = "xye + CFLAGS_save="$CFLAGS" + CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" + LDFLAGS_save="$LDFLAGS" +- LDFLAGS="$LDFLAGS $GNOME_PILOT_LIBS" ++ LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS" + + AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([ + -- 2.26.2