Fix compilation with gcc-4.3. Bug #251142

(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686)

5 files changed, 127 insertions, 6 deletions

diff --git a/games-util/showeq/ChangeLog b/games-util/showeq/ChangeLog
index 14eb0e79c48c..3126c968387f 100644
--- a/games-util/showeq/ChangeLog
+++ b/games-util/showeq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-util/showeq
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.25 2008/08/13 06:11:31 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.26 2009/01/12 19:50:46 tupone Exp $
+
+  12 Jan 2009; Tupone Alfredo <tupone@gentoo.org>
+  files/showeq-5.0.0.18-gcc4.patch, +files/showeq-5.12.4.2-gcc43.patch,
+  showeq-5.12.4.2.ebuild:
+  Fix compilation with gcc-4.3. Bug #251142 by Diego E. 'Flameeyes' Pettenò
 
 *showeq-5.12.4.2 (13 Aug 2008)
 
diff --git a/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch b/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch
index c2caecbab3fc..de92d453a53d 100644
--- a/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch
+++ b/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch
@@ -63,3 +63,58 @@
  {
    setPoints(nPoints, points);
  }
+--- src/messages.h.old	2009-01-12 19:39:32.000000000 +0100
++++ src/messages.h	2009-01-12 19:39:51.000000000 +0100
+@@ -49,7 +49,7 @@
+ 
+  protected slots:
+   void removedFilter(uint32_t mask, uint8_t filter);
+-  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++  void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+    
+  signals:
+   void newMessage(const MessageEntry& message);
+--- src/messagefilter.h.old	2009-01-12 19:39:11.000000000 +0100
++++ src/messagefilter.h	2009-01-12 19:39:27.000000000 +0100
+@@ -99,7 +99,7 @@
+ 
+  signals:
+   void removed(uint32_t mask, uint8_t filter);
+-  void added(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++  void added(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+ 
+  protected:
+   MessageFilter* m_filters[maxMessageFilters];
+--- src/mapicon.h.old	2009-01-12 20:11:23.000000000 +0100
++++ src/mapicon.h	2009-01-12 20:11:46.000000000 +0100
+@@ -206,7 +206,7 @@
+  protected:
+   // static paint methods
+   typedef void (*IconImageFunction)(QPainter&p, const QPoint& point,
+-				    int size, int size);
++				    int size1, int size2);
+   static void paintNone(QPainter&p, const QPoint& point, 
+ 			int size, int sizeWH);
+   static void paintCircle(QPainter&p, const QPoint& point, 
+--- src/messagewindow.h.old	2009-01-12 20:12:25.000000000 +0100
++++ src/messagewindow.h	2009-01-12 20:12:46.000000000 +0100
+@@ -180,7 +180,7 @@
+   void setCaption();
+   virtual void restoreFont();
+   void removedFilter(uint32_t mask, uint8_t filter);
+-  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++  void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+ 
+  protected:
+   void addMessage(const MessageEntry& message);
+--- src/messagefilterdialog.h.old	2009-01-12 20:13:15.000000000 +0100
++++ src/messagefilterdialog.h	2009-01-12 20:13:35.000000000 +0100
+@@ -46,7 +46,7 @@
+    void messageTypeSelectionChanged();
+    void existingFilterSelectionChanged(QListBoxItem * item);
+    void removedFilter(uint32_t mask, uint8_t filter);
+-   void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++   void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+ 
+  protected:
+    void clearFilter();
diff --git a/games-util/showeq/files/showeq-5.12.4.2-gcc43.patch b/games-util/showeq/files/showeq-5.12.4.2-gcc43.patch
new file mode 100644
index 000000000000..5032f785fc95
--- /dev/null
+++ b/games-util/showeq/files/showeq-5.12.4.2-gcc43.patch
@@ -0,0 +1,55 @@
+--- src/messages.h.old	2009-01-12 19:39:32.000000000 +0100
++++ src/messages.h	2009-01-12 19:39:51.000000000 +0100
+@@ -49,7 +49,7 @@
+ 
+  protected slots:
+   void removedFilter(uint32_t mask, uint8_t filter);
+-  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++  void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+    
+  signals:
+   void newMessage(const MessageEntry& message);
+--- src/messagefilter.h.old	2009-01-12 19:39:11.000000000 +0100
++++ src/messagefilter.h	2009-01-12 19:39:27.000000000 +0100
+@@ -99,7 +99,7 @@
+ 
+  signals:
+   void removed(uint32_t mask, uint8_t filter);
+-  void added(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++  void added(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+ 
+  protected:
+   MessageFilter* m_filters[maxMessageFilters];
+--- src/mapicon.h.old	2009-01-12 20:11:23.000000000 +0100
++++ src/mapicon.h	2009-01-12 20:11:46.000000000 +0100
+@@ -206,7 +206,7 @@
+  protected:
+   // static paint methods
+   typedef void (*IconImageFunction)(QPainter&p, const QPoint& point,
+-				    int size, int size);
++				    int size1, int size2);
+   static void paintNone(QPainter&p, const QPoint& point, 
+ 			int size, int sizeWH);
+   static void paintCircle(QPainter&p, const QPoint& point, 
+--- src/messagewindow.h.old	2009-01-12 20:12:25.000000000 +0100
++++ src/messagewindow.h	2009-01-12 20:12:46.000000000 +0100
+@@ -180,7 +180,7 @@
+   void setCaption();
+   virtual void restoreFont();
+   void removedFilter(uint32_t mask, uint8_t filter);
+-  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++  void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+ 
+  protected:
+   void addMessage(const MessageEntry& message);
+--- src/messagefilterdialog.h.old	2009-01-12 20:13:15.000000000 +0100
++++ src/messagefilterdialog.h	2009-01-12 20:13:35.000000000 +0100
+@@ -46,7 +46,7 @@
+    void messageTypeSelectionChanged();
+    void existingFilterSelectionChanged(QListBoxItem * item);
+    void removedFilter(uint32_t mask, uint8_t filter);
+-   void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
++   void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
+ 
+  protected:
+    void clearFilter();
diff --git a/games-util/showeq/showeq-5.0.0.18.ebuild b/games-util/showeq/showeq-5.0.0.18.ebuild
index 1764eae0d814..335d7cfb5d5f 100644
--- a/games-util/showeq/showeq-5.0.0.18.ebuild
+++ b/games-util/showeq/showeq-5.0.0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.10 2008/07/27 21:39:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.11 2009/01/12 19:50:46 tupone Exp $
 
 EAPI=1
 
diff --git a/games-util/showeq/showeq-5.12.4.2.ebuild b/games-util/showeq/showeq-5.12.4.2.ebuild
index 84c516a31699..58b2afae3410 100644
--- a/games-util/showeq/showeq-5.12.4.2.ebuild
+++ b/games-util/showeq/showeq-5.12.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.12.4.2.ebuild,v 1.1 2008/08/13 06:11:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.12.4.2.ebuild,v 1.2 2009/01/12 19:50:46 tupone Exp $
 
 EAPI=1
 inherit eutils qt3 games
@@ -17,6 +17,12 @@ IUSE=""
 DEPEND="virtual/libpcap
 	x11-libs/qt:3"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \