From: Gustavo Zacarias <gustavoz@gentoo.org>
Date: Tue, 6 Jun 2006 22:21:39 +0000 (+0000)
Subject: gcc4 build fix #134742, patch thanks to Gianluca Parmiggiani and Piotr Jaroszynski... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4645e26d4d5beb1319b5a2c547f11982f2ac6520;p=gentoo.git

gcc4 build fix #134742, patch thanks to Gianluca Parmiggiani and Piotr Jaroszynski for testing
Package-Manager: portage-2.0.54-r2
---

diff --git a/dev-libs/vdk/ChangeLog b/dev-libs/vdk/ChangeLog
index fee659e6fd2c..80a90899d66d 100644
--- a/dev-libs/vdk/ChangeLog
+++ b/dev-libs/vdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/vdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/ChangeLog,v 1.19 2006/05/29 19:31:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/ChangeLog,v 1.20 2006/06/06 22:21:39 gustavoz Exp $
+
+  06 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/vdk-2.4.1-gcc4.patch, vdk-2.4.1.ebuild:
+  gcc4 build fix #134742, patch thanks to Gianluca Parmiggiani and Piotr
+  Jaroszynski for testing
 
 *vdk-2.4.1 (29 May 2006)
 
diff --git a/dev-libs/vdk/Manifest b/dev-libs/vdk/Manifest
index f5c46e4529e0..10861da30190 100644
--- a/dev-libs/vdk/Manifest
+++ b/dev-libs/vdk/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0a888276c1e4a77d106063fcd81c9a25 ChangeLog 2290
+MD5 0753c0d799b24d6f6f0f41fe38ae1d95 ChangeLog 2493
 MD5 8bbcc0a70a6e499bd8539275f40e574a files/digest-vdk-2.4.0 62
 MD5 b64e64fcf7ea1c72741ce8e08c0c88c0 files/digest-vdk-2.4.1 62
 MD5 c3617790721213fc5725772e45f7b02b files/vdk-2.4-gcc3.4.patch 4695
+MD5 3a59ac7e050b7d330b6f5b7e5735f472 files/vdk-2.4.1-gcc4.patch 1300
 MD5 4947ebb6ec8d86caf11db3b648b545b4 metadata.xml 226
 MD5 7019dd18924de38038136a0f3016ebc1 vdk-2.4.0.ebuild 1663
-MD5 8b067f3f42e8d5f160f623315fec8fe6 vdk-2.4.1.ebuild 1663
+MD5 2dcdaf2d62bbe5d868bc0d78119e3c5d vdk-2.4.1.ebuild 1705
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEe0wvKRy60XGEcJIRAkHDAJ90fIZV/a92jXqG5LKuiPh2bYZUcgCgnFPu
-32YMgkAAuUIi5NovShAGJWs=
-=rOia
+iD8DBQFEhgAEKRy60XGEcJIRAiRDAKCyvXUxTDTeDk8bT7cz3+yeDjOURACeLG0Z
+iAkyg9opFKUwTj+j2WkPVWg=
+=QR+t
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/vdk/files/vdk-2.4.1-gcc4.patch b/dev-libs/vdk/files/vdk-2.4.1-gcc4.patch
new file mode 100644
index 000000000000..924248b75957
--- /dev/null
+++ b/dev-libs/vdk/files/vdk-2.4.1-gcc4.patch
@@ -0,0 +1,28 @@
+diff -Naur vdk-2.4.1/vdk/vdkcomboentry.h vdk-2.4.1-ok/vdk/vdkcomboentry.h
+--- vdk-2.4.1/vdk/vdkcomboentry.h	2004-09-10 08:14:48.000000000 +0200
++++ vdk-2.4.1-ok/vdk/vdkcomboentry.h	2006-05-30 11:39:18.000000000 +0200
+@@ -51,8 +51,8 @@
+ class VDKComboEntry: public VDKObject
+ {
+  protected:
+-  static int VDKComboEntry::FocusOutEvent(GtkWidget *,  GdkEventFocus*, gpointer wid);
+-  static int VDKComboEntry::FocusInEvent(GtkWidget *, GdkEventFocus*, gpointer wid);
++  static int FocusOutEvent(GtkWidget *,  GdkEventFocus*, gpointer wid);
++  static int FocusInEvent(GtkWidget *, GdkEventFocus*, gpointer wid);
+   VDKObjectSignal s_activated, s_changed, s_selected;
+  public:
+   /*!
+diff -Naur vdk-2.4.1/vdk/vdkfilechooser.h vdk-2.4.1-ok/vdk/vdkfilechooser.h
+--- vdk-2.4.1/vdk/vdkfilechooser.h	2004-09-10 08:15:10.000000000 +0200
++++ vdk-2.4.1-ok/vdk/vdkfilechooser.h	2006-05-30 11:39:04.000000000 +0200
+@@ -106,8 +106,8 @@
+   DECLARE_EVENT_LIST(VDKFileChooser);
+   // declares two static used to initialize
+   // form display type and initial position
+-  static GtkWindowType VDKFileChooser::DisplayType;
+-  static GtkWindowPosition VDKFileChooser::InitialPosition;
++  static GtkWindowType DisplayType;
++  static GtkWindowPosition InitialPosition;
+   //
+     /*! 
+    * Add a filter based on a pattern
diff --git a/dev-libs/vdk/vdk-2.4.1.ebuild b/dev-libs/vdk/vdk-2.4.1.ebuild
index e150f0091f06..ef53b37aa4cb 100644
--- a/dev-libs/vdk/vdk-2.4.1.ebuild
+++ b/dev-libs/vdk/vdk-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.1.ebuild,v 1.1 2006/05/29 19:31:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.1.ebuild,v 1.2 2006/06/06 22:21:39 gustavoz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -26,6 +26,7 @@ src_compile() {
 	"$(gcc-minor-version)" -ge "4" ]
 	then
 		epatch ${FILESDIR}/vdk-2.4-gcc3.4.patch
+		epatch ${FILESDIR}/vdk-2.4.1-gcc4.patch
 	fi
 
 	# gnome and sigc USE flags need to be added later