diff options
Diffstat (limited to 'x11-libs/wxGTK/files')
8 files changed, 0 insertions, 257 deletions
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch deleted file mode 100644 index cb0ce4370121..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur wxPython-src-2.6.3.3-orig/Makefile.in wxPython-src-2.6.3.3/Makefile.in ---- wxPython-src-2.6.3.3-orig/Makefile.in 2007-02-25 17:08:11.000000000 -0600 -+++ wxPython-src-2.6.3.3/Makefile.in 2007-02-25 17:20:46.000000000 -0600 -@@ -1081,8 +1081,8 @@ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -- -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \ -- $(CXXFLAGS) -+ -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT \ -+ $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - ODBCDLL_OBJECTS = \ - $(__odbcdll___win32rc) \ - odbcdll_db.o \ diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch deleted file mode 100644 index ad5dae3f502c..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.in ---- wxPython-src-2.6.4.0-orig/Makefile.in 2007-12-17 19:38:16.000000000 -0600 -+++ wxPython-src-2.6.4.0/Makefile.in 2007-12-17 19:41:49.000000000 -0600 -@@ -26,6 +26,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@ -@@ -9534,10 +9535,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) $(__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_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 \ -@@ -10215,8 +10215,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) $(DESTDIR)$(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 -@@ -10224,7 +10224,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.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/src/common/intl.cpp ---- wxPython-src-2.6.4.0-orig/src/common/intl.cpp 2007-03-20 09:25:41.000000000 -0600 -+++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-12-17 19:39:44.000000000 -0600 -@@ -1452,6 +1452,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, -@@ -1520,7 +1522,7 @@ - bool bOk = true; - if ( bLoadDefault ) - { -- 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 -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in ---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-12-17 19:38:16.000000000 -0600 -+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-12-17 19:39:44.000000000 -0600 -@@ -125,7 +125,6 @@ - @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) - @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.6.4-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch deleted file mode 100644 index 0f0ba8f42f9b..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur wxPython-src-2.6.4.0-orig/contrib/src/Makefile.in wxPython-src-2.6.4.0/contrib/src/Makefile.in ---- wxPython-src-2.6.4.0-orig/contrib/src/Makefile.in 2004-09-24 10:57:49.000000000 -0600 -+++ wxPython-src-2.6.4.0/contrib/src/Makefile.in 2008-06-28 22:00:31.000000000 -0600 -@@ -1,6 +1,6 @@ - # $Id: wxGTK-2.6.4-mmedia.patch,v 1.1 2008/06/29 04:31:59 dirtyepic Exp $ - --CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet -+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia - - all: - @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch deleted file mode 100644 index 49296d23f214..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch +++ /dev/null @@ -1,27 +0,0 @@ -In >=gtk+-2.11 GtkBorder uses GSlice, and using g_free here will cause -double free corruption. Use gtk_border_free instead. - -diff -Naur gtk-orig/button.cpp gtk/button.cpp ---- src/gtk-orig/button.cpp 2005-12-15 18:11:43.000000000 -0600 -+++ src/gtk/button.cpp 2007-07-28 20:58:06.000000000 -0600 -@@ -89,7 +89,7 @@ - right_border += default_border->right; - top_border += default_border->top; - bottom_border += default_border->bottom; -- g_free( default_border ); -+ gtk_border_free( default_border ); - } - #else - left_border = 6; -diff -Naur gtk-orig/window.cpp gtk/window.cpp ---- src/gtk-orig/window.cpp 2006-08-21 11:09:03.000000000 -0600 -+++ src/gtk/window.cpp 2007-07-28 20:58:36.000000000 -0600 -@@ -3273,7 +3273,7 @@ - right_border += default_border->right; - top_border += default_border->top; - bottom_border += default_border->bottom; -- g_free( default_border ); -+ gtk_border_free( default_border ); - } - #else - left_border = 6; diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch deleted file mode 100644 index e9db3480b0f0..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in ---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-09-01 15:03:10.000000000 -0600 -+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-09-01 15:06:56.000000000 -0600 -@@ -117,7 +117,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_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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.10.1-CVE-2009-2369.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-CVE-2009-2369.patch deleted file mode 100644 index 42392c8bb3d4..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-CVE-2009-2369.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp wxPython-src-2.8.10.1/src/common/imagpng.cpp ---- wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp 2008-05-11 22:26:45.000000000 -0600 -+++ wxPython-src-2.8.10.1/src/common/imagpng.cpp 2009-07-18 19:54:13.128547627 -0600 -@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image, - if (!image->Ok()) - goto error; - -- lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) ); -+ // initialize all line pointers to NULL to ensure that they can be safely -+ // free()d if an error occurs before all of them could be allocated -+ lines = (unsigned char **)calloc(height, sizeof(unsigned char *)); - if ( !lines ) - goto error; - - for (i = 0; i < height; i++) - { - if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL) -- { -- for ( unsigned int n = 0; n < i; n++ ) -- free( lines[n] ); - goto error; -- } - } - - png_read_image( png_ptr, lines ); -diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp wxPython-src-2.8.10.1/src/common/imagtiff.cpp ---- wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp 2007-09-21 14:27:05.000000000 -0600 -+++ wxPython-src-2.8.10.1/src/common/imagtiff.cpp 2009-07-18 19:54:35.801832862 -0600 -@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *i - } - - uint32 w, h; -- uint32 npixels; - uint32 *raster; - - TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w ); -@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *i - (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA || - samplesInfo[0] == EXTRASAMPLE_UNASSALPHA)); - -- npixels = w * h; -+ // guard against integer overflow during multiplication which could result -+ // in allocating a too small buffer and then overflowing it -+ const double bytesNeeded = (double)w * (double)h * sizeof(uint32); -+ if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ ) -+ { -+ if ( verbose ) -+ wxLogError( _("TIFF: Image size is abnormally big.") ); -+ -+ TIFFClose(tif); -+ -+ return false; -+ } - -- raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) ); -+ raster = (uint32*) _TIFFmalloc( bytesNeeded ); - - if (!raster) - { diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch deleted file mode 100644 index b875cb814ad6..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- wxPython-src-2.8.10.1-orig/src/gtk/gsockgtk.cpp -+++ wxPython-src-2.8.10.1/src/gtk/gsockgtk.cpp -@@ -15,8 +15,13 @@ - #include <stdlib.h> - #include <stdio.h> - -+// newer versions of glib define its own GSocket but we unfortunately use this -+// name in our own (semi-)public header and so can't change it -- rename glib -+// one instead -+#define GSocket GlibGSocket - #include <gdk/gdk.h> - #include <glib.h> -+#undef GSocket - - #include "wx/gsocket.h" - #include "wx/unix/gsockunx.h" diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch deleted file mode 100644 index ab9e48419e4f..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/301143 -http://trac.wxwidgets.org/ticket/11315 - -diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp -index c203f08..3ccf82f 100644 ---- a/src/gtk/app.cpp -+++ b/src/gtk/app.cpp -@@ -149,9 +149,11 @@ extern "C" - // One-shot emission hook for "event" signal, to install idle handler. - // This will be called when the "event" signal is issued on any GtkWidget object. - static gboolean --event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer) -+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) - { - wxapp_install_idle_handler(); -+ bool* hook_installed = (bool*)data; -+ *hook_installed = false; - // remove hook - return false; - } -@@ -159,12 +161,17 @@ event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer) - // add emission hook for "event" signal, to re-install idle handler when needed - static inline void wxAddEmissionHook() - { -+ static bool hook_installed; - GType widgetType = GTK_TYPE_WIDGET; -- // if GtkWidget type is loaded -- if (g_type_class_peek(widgetType) != NULL) -+ // if hook not installed and GtkWidget type is loaded -+ if (!hook_installed && g_type_class_peek(widgetType)) - { -- guint sig_id = g_signal_lookup("event", widgetType); -- g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL); -+ static guint sig_id; -+ if (sig_id == 0) -+ sig_id = g_signal_lookup("event", widgetType); -+ hook_installed = true; -+ g_signal_add_emission_hook( -+ sig_id, 0, event_emission_hook, &hook_installed, NULL); - } - } - |