diff options
Diffstat (limited to 'x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch')
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch index 967c93a45a88..2d1cc69b005f 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch @@ -1,6 +1,6 @@ -diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl ---- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl 2007-07-04 13:24:53.000000000 -0600 -+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-10-25 19:15:37.000000000 -0600 +diff -Naur wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx.bkl +--- wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx.bkl 2007-07-04 13:24:53.000000000 -0600 ++++ wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx.bkl 2007-12-17 19:58:30.000000000 -0600 @@ -51,12 +51,12 @@ <set var="__wx_included_impl">0</set> @@ -16,9 +16,9 @@ diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wx <set var="__wx_included_impl">1</set> </if> -diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl ---- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-07-04 13:24:53.000000000 -0600 -+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-10-25 19:15:23.000000000 -0600 +diff -Naur wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx_unix.bkl +--- wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-11-12 13:33:30.000000000 -0600 ++++ wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-12-17 19:58:30.000000000 -0600 @@ -3,7 +3,7 @@ <!-- @@ -37,9 +37,9 @@ diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.b </error> </if> -diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.in ---- wxPython-src-2.8.6.0-orig/Makefile.in 2007-10-25 19:11:40.000000000 -0600 -+++ wxPython-src-2.8.6.0/Makefile.in 2007-10-25 19:13:06.000000000 -0600 +diff -Naur wxPython-src-2.8.7.1-orig/Makefile.in wxPython-src-2.8.7.1/Makefile.in +--- wxPython-src-2.8.7.1-orig/Makefile.in 2007-12-17 19:48:48.000000000 -0600 ++++ wxPython-src-2.8.7.1/Makefile.in 2007-12-17 19:58:42.000000000 -0600 @@ -26,6 +26,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -48,12 +48,12 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ -@@ -11335,9 +11336,10 @@ +@@ -11335,10 +11336,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 +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) -+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4) $(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; \ @@ -61,7 +61,7 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i $(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 \ -@@ -12093,8 +12095,8 @@ +@@ -12094,8 +12094,8 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config @@ -72,7 +72,7 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -12102,7 +12104,7 @@ +@@ -12103,7 +12103,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/$$l.mo ; then \ @@ -81,10 +81,10 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i fi ; \ done -diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/src/common/intl.cpp ---- wxPython-src-2.8.6.0-orig/src/common/intl.cpp 2007-07-04 13:25:04.000000000 -0600 -+++ wxPython-src-2.8.6.0/src/common/intl.cpp 2007-10-25 19:13:06.000000000 -0600 -@@ -1513,6 +1513,8 @@ +diff -Naur wxPython-src-2.8.7.1-orig/src/common/intl.cpp wxPython-src-2.8.7.1/src/common/intl.cpp +--- wxPython-src-2.8.7.1-orig/src/common/intl.cpp 2007-11-12 13:33:31.000000000 -0600 ++++ wxPython-src-2.8.7.1/src/common/intl.cpp 2007-12-17 19:58:30.000000000 -0600 +@@ -1517,6 +1517,8 @@ m_initialized = false; } @@ -93,7 +93,7 @@ diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/sr // NB: this function has (desired) side effect of changing current locale bool wxLocale::Init(const wxChar *szName, const wxChar *szShort, -@@ -1581,7 +1583,7 @@ +@@ -1585,7 +1587,7 @@ bool bOk = true; if ( bLoadDefault ) { @@ -102,9 +102,9 @@ diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/sr // 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.6.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.0/utils/wxrc/Makefile.in ---- wxPython-src-2.8.6.0-orig/utils/wxrc/Makefile.in 2007-09-11 15:25:24.000000000 -0600 -+++ wxPython-src-2.8.6.0/utils/wxrc/Makefile.in 2007-10-25 19:13:06.000000000 -0600 +diff -Naur wxPython-src-2.8.7.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.7.1/utils/wxrc/Makefile.in +--- wxPython-src-2.8.7.1-orig/utils/wxrc/Makefile.in 2007-12-17 19:48:49.000000000 -0600 ++++ wxPython-src-2.8.7.1/utils/wxrc/Makefile.in 2007-12-17 19:58:30.000000000 -0600 @@ -118,7 +118,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) |