Revbump to fix typo in collision patch. Remove unused patches.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

5 files changed, 1 insertions, 133 deletions

diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
index a31f3c13ddee..244ce7328675 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
@@ -59,7 +59,7 @@ diff -Naurp wxPython-src-2.8.10.1-orig/src/common/intl.cpp wxPython-src-2.8.10.1
    if ( bLoadDefault )
    {
 -    bOk = AddCatalog(wxT("wxstd"));
-+    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
  
      // there may be a catalog with toolkit specific overrides, it is not
      // an error if this does not exist
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch
deleted file mode 100644
index bee51913b403..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.1/utils/wxrc/Makefile.in
---- wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in	2007-12-03 12:59:33.000000000 -0600
-+++ wxPython-src-2.8.6.1/utils/wxrc/Makefile.in	2007-12-03 13:02:01.000000000 -0600
-@@ -108,7 +108,7 @@
- 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
- 
- @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
--@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-+@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)
- @COND_USE_XRC_1@	
- @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
- 
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch
deleted file mode 100644
index 6391b73a33ad..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur wxPython-src-2.8.9.1-orig/Makefile.in wxPython-src-2.8.9.1/Makefile.in
---- wxPython-src-2.8.9.1-orig/Makefile.in	2008-10-28 16:27:37.000000000 -0600
-+++ wxPython-src-2.8.9.1/Makefile.in	2008-10-28 16:29:45.000000000 -0600
-@@ -27,6 +27,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- BK_DEPS = @BK_DEPS@
- BK_MAKE_PCH = @BK_MAKE_PCH@
- srcdir = @srcdir@
-@@ -11342,10 +11343,9 @@
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
-+	do $(INSTALL_DATA)  $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
- 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -12101,8 +12101,8 @@
- install-wxconfig: 
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
--	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- 
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -12110,7 +12110,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
-diff -Naur wxPython-src-2.8.9.1-orig/src/common/intl.cpp wxPython-src-2.8.9.1/src/common/intl.cpp
---- wxPython-src-2.8.9.1-orig/src/common/intl.cpp	2008-10-28 16:27:37.000000000 -0600
-+++ wxPython-src-2.8.9.1/src/common/intl.cpp	2008-10-28 16:28:16.000000000 -0600
-@@ -1529,6 +1529,8 @@
-   m_initialized = false;
- }
- 
-+#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
-+
- // NB: this function has (desired) side effect of changing current locale
- bool wxLocale::Init(const wxChar *szName,
-                     const wxChar *szShort,
-@@ -1597,7 +1599,7 @@
-   bool bOk = true;
-   if ( bLoadDefault )
-   {
--    bOk = AddCatalog(wxT("wxstd"));
-+    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd"));
- 
-     // there may be a catalog with toolkit specific overrides, it is not
-     // an error if this does not exist
-diff -Naur wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.9.1/utils/wxrc/Makefile.in
---- wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in	2008-10-28 16:27:37.000000000 -0600
-+++ wxPython-src-2.8.9.1/utils/wxrc/Makefile.in	2008-10-28 16:28:16.000000000 -0600
-@@ -120,7 +120,6 @@
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.9-dont-touch-my-bools.patch b/x11-libs/wxGTK/files/wxGTK-2.8.9-dont-touch-my-bools.patch
deleted file mode 100644
index 42201b6941ef..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.9-dont-touch-my-bools.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp wxPython-src-2.8.9.1-orig/include/wx/db.h wxPython-src-2.8.9.1/include/wx/db.h
---- wxPython-src-2.8.9.1-orig/include/wx/db.h	2007-07-04 13:24:57.000000000 -0600
-+++ wxPython-src-2.8.9.1/include/wx/db.h	2008-11-07 17:05:16.000000000 -0600
-@@ -78,10 +78,15 @@
-         // defined in many other places on other systems (Motif, at least on
-         // OpenVMS; Cocoa and X11) so prevent the problem by defining it before
-         // including these headers
--        #define BOOL int
--        #include <sql.h>
--        #include <sqlext.h>
--        #undef BOOL
-+        #ifndef BOOL
-+            #define BOOL int
-+            #include <sql.h>
-+            #include <sqlext.h>
-+            #undef BOOL
-+        #else
-+            #include <sql.h>
-+            #include <sqlext.h>
-+        #endif
-     #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
-     }
- #endif
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch b/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch
deleted file mode 100644
index 2448d0a6866e..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=264544
-http://trac.wxwidgets.org/ticket/10370
-
---- wxPython-src-2.8.9.2-orig/src/html/m_tables.cpp
-+++ wxPython-src-2.8.9.2/src/html/m_tables.cpp
-@@ -684,6 +684,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH
-         {
-             wxHtmlTableCell *oldt = m_Table;
- 
-+            wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
-             m_enclosingContainer = c = m_WParser->OpenContainer();
- 
-             m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
-@@ -722,6 +723,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH
-             m_WParser->CloseContainer();
- 
-             m_Table = oldt;
-+            m_enclosingContainer = oldEnclosing;
- 
-             return true; // ParseInner() called
-         }