From 0ed0f751059d920a85c4c30983429307c2f2c29f Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sat, 9 Dec 2006 20:19:37 +0000 Subject: [PATCH] Added patch fixing compilation with GCC 4 (bug #138370). Note that building with USE="gtk" is still broken (bug #121818). Package-Manager: portage-2.1.2_rc3 --- app-pda/plucker/ChangeLog | 9 +++- app-pda/plucker/Manifest | 44 +++++++++++++------- app-pda/plucker/files/digest-plucker-1.8 | 2 + app-pda/plucker/files/digest-plucker-1.8-r1 | 2 + app-pda/plucker/files/plucker-1.8-gcc4.patch | 11 +++++ app-pda/plucker/plucker-1.8-r1.ebuild | 13 ++++-- 6 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 app-pda/plucker/files/plucker-1.8-gcc4.patch diff --git a/app-pda/plucker/ChangeLog b/app-pda/plucker/ChangeLog index e89abad7334b..e58573345c55 100644 --- a/app-pda/plucker/ChangeLog +++ b/app-pda/plucker/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-pda/plucker -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/plucker/ChangeLog,v 1.9 2005/06/23 13:03:59 agriffis Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/plucker/ChangeLog,v 1.10 2006/12/09 20:19:37 dirtyepic Exp $ + + 09 Dec 2006; Ryan Hill + +files/plucker-1.8-gcc4.patch, plucker-1.8-r1.ebuild: + Added patch fixing compilation with GCC 4 (bug #138370). Note that building + with USE="gtk" is still broken (bug #121818). 23 Jun 2005; Aron Griffis plucker-1.8-r1.ebuild: Plucker doesn't build with unicode wxGTK, so make sure we get the ansi diff --git a/app-pda/plucker/Manifest b/app-pda/plucker/Manifest index 1bcca605217b..6375451dd127 100644 --- a/app-pda/plucker/Manifest +++ b/app-pda/plucker/Manifest @@ -1,17 +1,31 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 e78f9b27586178df86f81d4c525d71b4 plucker-1.8-r1.ebuild 2810 -MD5 8dc8f8205042a108fb3ac1fa254c602a ChangeLog 1260 +AUX plucker-1.8-Makefile.in.patch 471 RMD160 4194daf96f45514e8d077ffd06535f9d4f34759f SHA1 4dfed47b8501bc05738fa41307a1b4fe5770fe2e SHA256 e338c47807d51b4ddfc192c46a1cf4962573044b637013b99e597e995b4304d0 +MD5 eceb19a50345feaf7555797e86a0ccff files/plucker-1.8-Makefile.in.patch 471 +RMD160 4194daf96f45514e8d077ffd06535f9d4f34759f files/plucker-1.8-Makefile.in.patch 471 +SHA256 e338c47807d51b4ddfc192c46a1cf4962573044b637013b99e597e995b4304d0 files/plucker-1.8-Makefile.in.patch 471 +AUX plucker-1.8-gcc4.patch 444 RMD160 9b1130bb17c8bc50817c592f704af06895dbbd70 SHA1 7169cab73f6bde18a3098da19270d82ff0a419d1 SHA256 b20f1ab8a6cfffa69b923da82b25a69e4e7203fc996793c37d66bdd244b502da +MD5 7306991ff36a23e9ed1409e14b608c6d files/plucker-1.8-gcc4.patch 444 +RMD160 9b1130bb17c8bc50817c592f704af06895dbbd70 files/plucker-1.8-gcc4.patch 444 +SHA256 b20f1ab8a6cfffa69b923da82b25a69e4e7203fc996793c37d66bdd244b502da files/plucker-1.8-gcc4.patch 444 +DIST plucker_src-1.8.tar.bz2 3134000 RMD160 74059c5f9e3625feabfbbd8f52471921d7213415 SHA1 90179143cba59f2b222325fb272a41352724ff06 SHA256 fc6c2007fdd0e6acaee426ec237b85ae637d2025b2e586f487c72a4f93b54717 +EBUILD plucker-1.8-r1.ebuild 2911 RMD160 a065003ea18e946ea5a817f22240e073fca6563a SHA1 fc5f3e02a3dcc5ad025adea1317549755384800b SHA256 2fdfb8f67a7a09c095dc1de6771d030ed07cf23f158a522dec9bf7976aa31ae8 +MD5 fffa1d54160fd9dcc718420b6336151a plucker-1.8-r1.ebuild 2911 +RMD160 a065003ea18e946ea5a817f22240e073fca6563a plucker-1.8-r1.ebuild 2911 +SHA256 2fdfb8f67a7a09c095dc1de6771d030ed07cf23f158a522dec9bf7976aa31ae8 plucker-1.8-r1.ebuild 2911 +EBUILD plucker-1.8.ebuild 1514 RMD160 69472e07e923068244172ee669c6a7cf1c95a456 SHA1 53cb9efd846c489798eb105e5bf6431a6b721597 SHA256 5398a318bece7a14837f0082be6b38ab071e8db1e4031fdb568ead07041767cb MD5 a4f378385e9e65b9348729f16f6d9a75 plucker-1.8.ebuild 1514 +RMD160 69472e07e923068244172ee669c6a7cf1c95a456 plucker-1.8.ebuild 1514 +SHA256 5398a318bece7a14837f0082be6b38ab071e8db1e4031fdb568ead07041767cb plucker-1.8.ebuild 1514 +MISC ChangeLog 1493 RMD160 a4931b043decea4c9386d8732117bfc54db53a4c SHA1 6daa454d06c34f94e26be70ed36d3b18b685fe81 SHA256 2d95e050a385a7e4a5532364be5a81f5a14a9fd651b648bd47583b18ad572a73 +MD5 f76926d2b39b5fb2731213d99506761b ChangeLog 1493 +RMD160 a4931b043decea4c9386d8732117bfc54db53a4c ChangeLog 1493 +SHA256 2d95e050a385a7e4a5532364be5a81f5a14a9fd651b648bd47583b18ad572a73 ChangeLog 1493 +MISC metadata.xml 220 RMD160 c1fb9ecde2b02844af2cc48f42374a7759acb36f SHA1 9d221d70e27639c956f7a6b2d19ae3da163f720d SHA256 3d28ed9ddd8b50ea8a6d6c1005007cea2c90f61ff9a6be0c0ee6e9bb6692729f MD5 659d1c5630abf66b0130dcd4d1a62e1f metadata.xml 220 -MD5 eceb19a50345feaf7555797e86a0ccff files/plucker-1.8-Makefile.in.patch 471 -MD5 2a325fec96dd6188d796b0fbf85b3bfb files/digest-plucker-1.8 69 -MD5 2a325fec96dd6188d796b0fbf85b3bfb files/digest-plucker-1.8-r1 69 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCurNSBXaUFmZvwyMRAnpQAKCg6tkxetdjgyUNI2/wthhh2JYMyACeO0hY -oIHqAjIr1/yTm5Ecw+VH/WU= -=vFdg ------END PGP SIGNATURE----- +RMD160 c1fb9ecde2b02844af2cc48f42374a7759acb36f metadata.xml 220 +SHA256 3d28ed9ddd8b50ea8a6d6c1005007cea2c90f61ff9a6be0c0ee6e9bb6692729f metadata.xml 220 +MD5 8f48985bd32b1f7cca67f9ddf1c6ccd9 files/digest-plucker-1.8 253 +RMD160 0225bef6778b5c462e78442bdbbd47e7319fe04c files/digest-plucker-1.8 253 +SHA256 bc9ad5c44f98f837b2c02b8a9df686c6995063ef0e0e320da91206a134f0b6dc files/digest-plucker-1.8 253 +MD5 8f48985bd32b1f7cca67f9ddf1c6ccd9 files/digest-plucker-1.8-r1 253 +RMD160 0225bef6778b5c462e78442bdbbd47e7319fe04c files/digest-plucker-1.8-r1 253 +SHA256 bc9ad5c44f98f837b2c02b8a9df686c6995063ef0e0e320da91206a134f0b6dc files/digest-plucker-1.8-r1 253 diff --git a/app-pda/plucker/files/digest-plucker-1.8 b/app-pda/plucker/files/digest-plucker-1.8 index 742228ae131b..4b7a08280a6a 100644 --- a/app-pda/plucker/files/digest-plucker-1.8 +++ b/app-pda/plucker/files/digest-plucker-1.8 @@ -1 +1,3 @@ MD5 ff4d0890ebdfd1a0f130530b67bafc0b plucker_src-1.8.tar.bz2 3134000 +RMD160 74059c5f9e3625feabfbbd8f52471921d7213415 plucker_src-1.8.tar.bz2 3134000 +SHA256 fc6c2007fdd0e6acaee426ec237b85ae637d2025b2e586f487c72a4f93b54717 plucker_src-1.8.tar.bz2 3134000 diff --git a/app-pda/plucker/files/digest-plucker-1.8-r1 b/app-pda/plucker/files/digest-plucker-1.8-r1 index 742228ae131b..4b7a08280a6a 100644 --- a/app-pda/plucker/files/digest-plucker-1.8-r1 +++ b/app-pda/plucker/files/digest-plucker-1.8-r1 @@ -1 +1,3 @@ MD5 ff4d0890ebdfd1a0f130530b67bafc0b plucker_src-1.8.tar.bz2 3134000 +RMD160 74059c5f9e3625feabfbbd8f52471921d7213415 plucker_src-1.8.tar.bz2 3134000 +SHA256 fc6c2007fdd0e6acaee426ec237b85ae637d2025b2e586f487c72a4f93b54717 plucker_src-1.8.tar.bz2 3134000 diff --git a/app-pda/plucker/files/plucker-1.8-gcc4.patch b/app-pda/plucker/files/plucker-1.8-gcc4.patch new file mode 100644 index 000000000000..e03665a48d61 --- /dev/null +++ b/app-pda/plucker/files/plucker-1.8-gcc4.patch @@ -0,0 +1,11 @@ +--- ./plucker_desktop/proxy_wizardpage.h.orig 2006-07-15 20:30:35.000000000 +0100 ++++ ./plucker_desktop/proxy_wizardpage.h 2006-07-15 20:31:05.000000000 +0100 +@@ -71,7 +71,7 @@ + /*! + \return TRUE if proxy is valid. + */ +- bool proxy_wizardpage::is_proxy_valid(); ++ bool is_proxy_valid(); + + //! Writes the proxy settings collected. into their configuration file keys. + void write_configuration(); diff --git a/app-pda/plucker/plucker-1.8-r1.ebuild b/app-pda/plucker/plucker-1.8-r1.ebuild index 450b5fa89529..f76daab4c8ad 100644 --- a/app-pda/plucker/plucker-1.8-r1.ebuild +++ b/app-pda/plucker/plucker-1.8-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/plucker/plucker-1.8-r1.ebuild,v 1.8 2005/06/23 13:03:59 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/plucker/plucker-1.8-r1.ebuild,v 1.9 2006/12/09 20:19:37 dirtyepic Exp $ IUSE="gtk" @@ -13,10 +13,12 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" DEPEND=">=dev-lang/python-1.5.2 - gtk? ( >=x11-libs/gtk+-2.2 x11-libs/wxGTK ) + gtk? ( >=x11-libs/gtk+-2.2 + =x11-libs/wxGTK-2.4* ) sys-devel/autoconf" RDEPEND=">=dev-lang/python-1.5.2 - gtk? ( >=x11-libs/gtk+-2.2 x11-libs/wxGTK ) + gtk? ( >=x11-libs/gtk+-2.2 + =x11-libs/wxGTK-2.4* ) || ( >=media-gfx/imagemagick-5.4.4 >=dev-python/imaging-1.1 @@ -30,6 +32,9 @@ src_unpack() { # Repair broken Makefile.in epatch ${FILESDIR}/plucker-1.8-Makefile.in.patch + # GCC 4 - extra qualification - Bug #138370 + epatch "${FILESDIR}"/${P}-gcc4.patch + # Repair documentation installation path sed -i "/^DOCSDIR/s/packages/${PF}/" plucker_desktop/Makefile.in || die "sed 1 failed" -- 2.26.2