Added patch fixing compilation with GCC 4 (bug #138370). Note that building with USE="gtk" is still broken (bug #121818).

(Portage version: 2.1.2_rc3)

5 files changed, 31 insertions, 6 deletions

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 <dirtyepic@gentoo.org>
+  +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 <agriffis@gentoo.org> 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/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"