Thanks to Chris Fairles <cafairle AT engmail DOT uwaterloo DOT ca> for the gcc-4 patch; bug #117357

Package-Manager: portage-2.1_pre4-r1

4 files changed, 254 insertions, 12 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 5a7501e492cd..9a743a395f4b 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.111 2006/02/03 21:00:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.112 2006/02/13 06:51:33 halcy0n Exp $
+
+  13 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/wxGTK-2.4.2-gcc4.patch, wxGTK-2.4.2-r4.ebuild:
+  Thanks to Chris Fairles <cafairle AT engmail DOT uwaterloo DOT ca> for the
+  gcc-4 patch; bug #117357
 
   03 Feb 2006; Aron Griffis <agriffis@gentoo.org> wxGTK-2.6.2-r1.ebuild:
   Mark 2.6.2-r1 stable on ia64
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 1611191287a6..22be571f38c2 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cd641562cc6a3171ec3dd6c72e1faecd ChangeLog 17389
-RMD160 d060a93292404f2f0432505771cc63546fed7be9 ChangeLog 17389
-SHA256 8fbe7410d5349527ab5dee93271fe17107161dc2d5dba4a20d8fd7be65afeda2 ChangeLog 17389
+MD5 37cbacddbf518573eae18c82cfc77190 ChangeLog 17597
+RMD160 0134b896cd4c3b7f86658275a8ce403ca7554155 ChangeLog 17597
+SHA256 ca99612bc939e6ed5b50a2f532eaa155316455e5947994befbda7529ae85d2ec ChangeLog 17597
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 RMD160 51232262c3e1ba5b29c3772d2ee61639c2c4cfb0 files/digest-wxGTK-2.4.2-r2 65
 SHA256 562f9f2432a97bab9206c13ef4cfa04eccdfe82413d5854163a4d63a1e9893d9 files/digest-wxGTK-2.4.2-r2 65
@@ -49,6 +49,9 @@ SHA256 de6fdf92f166a3a49afbd4104377fdf06001001910ecbf51db0f6c5d7f8535d1 files/wx
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
 RMD160 5c500bc5e115bb45160e78e7a6ac244df27e4689 files/wxGTK-2.4.2-contrib_animate.patch 442
 SHA256 108c0b5336ee5a7777a19e9ed44a4c5ccc43c2c958bb0bb5517a52f497eaaf77 files/wxGTK-2.4.2-contrib_animate.patch 442
+MD5 1b45f02937323f9661b98919113cfb31 files/wxGTK-2.4.2-gcc4.patch 9773
+RMD160 ea73fe7b253682b04cdc4d8fd8cabe3e3e4bcba2 files/wxGTK-2.4.2-gcc4.patch 9773
+SHA256 3d1f0cfe5e162c37874b116f78c328a9ed22dcd464fe2f361da5c1975c679d38 files/wxGTK-2.4.2-gcc4.patch 9773
 MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
 RMD160 250f50903c51642b62d318f78728ea3d065b850b files/wxGTK-2.4.2-menu.cpp.patch 2253
 SHA256 d24b8498ef3558b31cd5103955c2e3e2842cb453d1370c23986d78c7cfe35369 files/wxGTK-2.4.2-menu.cpp.patch 2253
@@ -70,9 +73,9 @@ SHA256 e5d40364cfe22634a05436c746661e8a9db891b13e91db2d683bfcf95092cbea wxGTK-2.
 MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733
 RMD160 315645c7aff67269ba536c3415a82f49ad55bc22 wxGTK-2.4.2-r3.ebuild 4733
 SHA256 c131aca8db215f656c2927f130547b0e8271dd3223e5a0dd5de4827101054153 wxGTK-2.4.2-r3.ebuild 4733
-MD5 db521265c417bb0d2b3649310a19f2cc wxGTK-2.4.2-r4.ebuild 4827
-RMD160 dd8aff4745eada0e497c4a56f1d346826a04aad1 wxGTK-2.4.2-r4.ebuild 4827
-SHA256 472280aaaea9ce298f21d1c4b698ffa39ea8d59987f1931440e903735f0191b1 wxGTK-2.4.2-r4.ebuild 4827
+MD5 14ad0437575fd9d0fc4a083764b96938 wxGTK-2.4.2-r4.ebuild 4902
+RMD160 a5787e4234520dd148cf95881251f2ac8caa049d wxGTK-2.4.2-r4.ebuild 4902
+SHA256 49fd46fbe1cbe79a656455692a8ad3025d30831cd4d53ab4d2ad273cd0910531 wxGTK-2.4.2-r4.ebuild 4902
 MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
 RMD160 22519dd5c53cb60795bb4aab53950bdc5d5ba366 wxGTK-2.5.3.ebuild 4812
 SHA256 f7b472ab7d9418103a48da351ce1cd14ee6151a1bd8d2459bf0a5f2ffb443eea wxGTK-2.5.3.ebuild 4812
@@ -92,9 +95,9 @@ MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
 RMD160 0caf5f3409224a0542e2386411ddfe6819765cb8 wxGTK-2.6.2.ebuild 1531
 SHA256 c3f69c6446d36b8b1880141adac5b3f8d49365308a378a5f5fdad824e1e22ffb wxGTK-2.6.2.ebuild 1531
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD48R1JrHF4yAQTrARAuhGAJ9LGQUNquk82z9bAblYpTrSXztk9ACfZUjI
-CCHFKlvHBn76jO4YITqcSnQ=
-=d7dn
+iD8DBQFD8CyMCRZPokWLroQRAgLjAKDMhzjUPLuxzMgcJKhou/ZCfbNl8gCeMSf/
+MBllLvg5/El+JDSsO3CC23E=
+=VBy5
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
new file mode 100644
index 000000000000..1ffc4be42a3a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
@@ -0,0 +1,230 @@
+--- wxGTK-2.4.2/contrib/src/xrc/xml.cpp.orig	2006-01-01 13:05:58.000000000 -0500
++++ wxGTK-2.4.2/contrib/src/xrc/xml.cpp	2006-01-01 13:07:41.000000000 -0500
+@@ -354,8 +354,8 @@
+ #else
+     if ( conv )
+     {
+-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
+-                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
++        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
++                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
+ 
+         wchar_t *buf = new wchar_t[nLen+1];
+         wxConvUTF8.MB2WC(buf, s, nLen);
+--- wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.orig	2006-01-01 13:09:01.000000000 -0500
++++ wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c	2006-01-01 13:10:00.000000000 -0500
+@@ -203,8 +203,10 @@
+ static enum XML_Error
+ doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+ 	 const char *end, int tok, const char *next, const char **nextPtr);
++#ifdef XML_DTD
+ static enum XML_Error
+ processInternalParamEntity(XML_Parser parser, ENTITY *entity);
++#endif /* XML_DTD */
+ static enum XML_Error
+ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
+ 	  const char *start, const char *end, const char **endPtr);
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.orig	2006-01-01 13:10:57.000000000 -0500
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx	2006-01-01 13:11:50.000000000 -0500
+@@ -850,6 +850,8 @@
+ 	DocumentIndexer(Document *pdoc_, int end_) :
+ 		pdoc(pdoc_), end(end_) {
+ 	}
++  
++        virtual ~DocumentIndexer() {};
+ 
+ 	virtual char CharAt(int index) {
+ 		if (index < 0 || index >= end)
+
+--- wxGTK-2.4.2/src/common/sckfile.cpp.orig	2006-01-01 13:13:57.000000000 -0500
++++ wxGTK-2.4.2/src/common/sckfile.cpp	2006-01-01 13:14:09.000000000 -0500
+@@ -9,7 +9,7 @@
+ // Licence:     wxWindows license
+ /////////////////////////////////////////////////////////////////////////////
+ #ifdef __GNUG__
+-#pragma implementation "sckfile.h"
++#pragma implementation "file.h"
+ #endif
+ 
+ // For compilers that support precompilation, includes "wx.h".
+--- wxGTK-2.4.2/include/wx/dir.h.orig	2006-01-01 13:14:53.000000000 -0500
++++ wxGTK-2.4.2/include/wx/dir.h	2006-01-01 13:15:22.000000000 -0500
+@@ -52,6 +52,7 @@
+ class WXDLLEXPORT wxDirTraverser
+ {
+ public:
++    virtual ~wxDirTraverser() {};
+     // called for each file found by wxDir::Traverse()
+     //
+     // return wxDIR_STOP or wxDIR_CONTINUE from here
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.orig	2006-01-01 13:23:30.000000000 -0500
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h	2006-01-01 13:23:57.000000000 -0500
+@@ -38,6 +38,7 @@
+ 		strncpy(name, languageName_, sizeof(name));
+ 		languageName = name;
+ 	};
++	virtual ~ExternalLexerModule() {};
+ 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
+ 					WordList *keywordlists[], Accessor &styler) const;
+ 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.orig	2006-01-01 13:25:02.000000000 -0500
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h	2006-01-01 13:25:36.000000000 -0500
+@@ -29,6 +29,7 @@
+ 	LexerModule(int language_, LexerFunction fnLexer_, 
+ 		const char *languageName_=0, LexerFunction fnFolder_=0,
+ 		const char * const wordListDescriptions_[] = NULL);
++	virtual ~LexerModule() {};
+ 	int GetLanguage() const { return language; }
+ 
+ 	// -1 is returned if no WordList information is available
+--- wxGTK-2.4.2/src/common/dircmn.cpp.orig	2006-01-01 13:26:37.000000000 -0500
++++ wxGTK-2.4.2/src/common/dircmn.cpp	2006-01-01 13:27:10.000000000 -0500
+@@ -147,6 +147,7 @@
+ {
+ public:
+     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
++    virtual ~wxDirTraverserSimple() {};
+ 
+     virtual wxDirTraverseResult OnFile(const wxString& filename)
+     {
+--- wxGTK-2.4.2/src/common/xpmdecod.cpp.orig	2006-01-01 13:28:05.000000000 -0500
++++ wxGTK-2.4.2/src/common/xpmdecod.cpp	2006-01-01 13:28:56.000000000 -0500
+@@ -669,7 +669,7 @@
+     wxChar key[64];
+     const char *clr_def;
+     bool hasMask;
+-    wxXPMColourMapData clr_data;
++    wxXPMColourMapData clr_data = {0, 0, 0};
+     wxXPMColourMap clr_tbl;
+ 
+     /*
+@@ -712,7 +712,7 @@
+         }
+         else
+         {
+-            bool isNone;
++            bool isNone = false;
+             if ( !GetRGBFromName(clr_def, &isNone,
+                                  &clr_data.R, &clr_data.G, &clr_data.B) )
+             {
+--- wxGTK-2.4.2/src/unix/mimetype.cpp.orig	2006-01-01 13:29:58.000000000 -0500
++++ wxGTK-2.4.2/src/unix/mimetype.cpp	2006-01-01 13:30:31.000000000 -0500
+@@ -1580,7 +1580,7 @@
+     {
+         // now got a file we can write to ....
+         wxMimeTypeCommands * entries = m_aEntries[index];
+-        size_t iOpen;
++        size_t iOpen = 0;
+         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+         wxString sTmp;
+ 
+--- wxGTK-2.4.2/include/wx/statline.h.orig	2006-01-01 13:31:31.000000000 -0500
++++ wxGTK-2.4.2/include/wx/statline.h	2006-01-01 13:31:53.000000000 -0500
+@@ -39,6 +39,7 @@
+ public:
+     // constructor
+     wxStaticLineBase() { }
++    virtual ~wxStaticLineBase() {};
+ 
+     // is the line vertical?
+     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
+
+--- wxGTK-2.4.2/include/wx/datetime.h.orig	2006-01-01 13:32:24.000000000 -0500
++++ wxGTK-2.4.2/include/wx/datetime.h	2006-01-01 13:34:08.000000000 -0500
+@@ -1300,6 +1300,7 @@
+ {
+ friend class wxDateTimeHolidaysModule;
+ public:
++    virtual ~wxDateTimeHolidayAuthority() {};
+     // returns TRUE if the given date is a holiday
+     static bool IsHoliday(const wxDateTime& dt);
+ 
+@@ -1340,6 +1341,8 @@
+ // the holidays for this class are all Saturdays and Sundays
+ class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
+ {
++public:
++    virtual ~wxDateTimeWorkDays() {};
+ protected:
+     virtual bool DoIsHoliday(const wxDateTime& dt) const;
+     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
+--- wxGTK-2.4.2/include/wx/notebook.h.orig	2006-01-01 13:35:14.000000000 -0500
++++ wxGTK-2.4.2/include/wx/notebook.h	2006-01-01 13:35:36.000000000 -0500
+@@ -193,6 +193,7 @@
+             m_nSel = nSel;
+             m_nOldSel = nOldSel;
+         }
++    virtual ~wxNotebookEvent() {};
+ 
+     // accessors
+         // the currently selected page (-1 if none)
+--- wxGTK-2.4.2/include/wx/event.h.orig	2006-01-01 13:36:05.000000000 -0500
++++ wxGTK-2.4.2/include/wx/event.h	2006-01-01 13:36:43.000000000 -0500
+@@ -1952,6 +1952,7 @@
+         : wxEventTableEntryBase(id, idLast, fn, data),
+         m_eventType(evType)
+     { }
++    virtual ~wxEventTableEntry() {};
+ 
+     // the reference to event type: this allows us to not care about the
+     // (undefined) order in which the event table entries and the event types
+--- wxGTK-2.4.2/include/wx/geometry.h.orig	2006-01-01 13:37:21.000000000 -0500
++++ wxGTK-2.4.2/include/wx/geometry.h	2006-01-01 13:37:49.000000000 -0500
+@@ -785,6 +785,7 @@
+ class wxTransform2D
+ {
+ public :
++    virtual ~wxTransform2D() {};
+     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
+     virtual void                    Transform( wxRect2DInt* r ) const;
+     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
+--- wxGTK-2.4.2/include/wx/list.h.orig	2006-01-01 13:38:40.000000000 -0500
++++ wxGTK-2.4.2/include/wx/list.h	2006-01-01 13:41:12.000000000 -0500
+@@ -385,6 +385,8 @@
+                  const wxListKey& key = wxDefaultListKey)                   \
+             : wxNodeBase(list, previous, next, data, key) { }               \
+                                                                             \
++        virtual ~nodetype() {};                                             \
++                                                                            \
+         nodetype *GetNext() const                                           \
+             { return (nodetype *)wxNodeBase::GetNext(); }                   \
+         nodetype *GetPrevious() const                                       \
+@@ -411,6 +413,8 @@
+         name& operator=(const name& list)                                   \
+             { (void) wxListBase::operator=(list); return *this; }           \
+                                                                             \
++        virtual ~name() {};						     \
++                                                                            \
+         nodetype *GetFirst() const                                          \
+             { return (nodetype *)wxListBase::GetFirst(); }                  \
+         nodetype *GetLast() const                                           \
+--- wxGTK-2.4.2/include/wx/radiobox.h.orig	2006-01-01 13:41:57.000000000 -0500
++++ wxGTK-2.4.2/include/wx/radiobox.h	2006-01-01 13:42:21.000000000 -0500
+@@ -35,6 +35,7 @@
+ class WXDLLEXPORT wxRadioBoxBase
+ {
+ public:
++    virtual ~wxRadioBoxBase() {};
+     // selection
+     virtual void SetSelection(int n) = 0;
+     virtual int GetSelection() const = 0;
+--- wxGTK-2.4.2/include/wx/caret.h.orig	2006-01-01 13:42:56.000000000 -0500
++++ wxGTK-2.4.2/include/wx/caret.h	2006-01-01 13:43:26.000000000 -0500
+@@ -61,6 +61,7 @@
+         (void)Create(window, size);
+     }
+ 
++    virtual ~wxCaretBase() {};
+     // Create() functions - same as ctor but returns the success code
+     // --------------------------------------------------------------
+ 
+--- wxGTK-2.4.2/include/wx/clipbrd.h.orig	2006-01-01 13:45:13.000000000 -0500
++++ wxGTK-2.4.2/include/wx/clipbrd.h	2006-01-01 13:45:33.000000000 -0500
+@@ -39,6 +39,7 @@
+ {
+ public:
+     wxClipboardBase();
++    virtual ~wxClipboardBase() {};
+ 
+     // open the clipboard before Add/SetData() and GetData()
+     virtual bool Open() = 0;
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
index fd1283e27b3e..af4c0ad68050 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r4.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/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild,v 1.5 2006/01/22 03:09:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild,v 1.6 2006/02/13 06:51:33 halcy0n Exp $
 
 inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
 
@@ -42,6 +42,10 @@ src_unpack() {
 	# disable contrib/src/animate
 	EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch
 	use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch
+
+	# gcc 4 compile patch ; bug #117357
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+
 	gnuconfig_update
 }