summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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.patch39
1 files changed, 0 insertions, 39 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 2d1cc69b005f..b22633029b6a 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
@@ -1,42 +1,3 @@
-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>
-
- <if cond="FORMAT in ['autoconf','gnu']">
-- <include file="wx_unix.bkl"/>
-+ <include file="wx28_unix.bkl"/>
- <set var="__wx_included_impl">1</set>
- </if>
-
- <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
-- <include file="wx_win32.bkl"/>
-+ <include file="wx28_win32.bkl"/>
- <set var="__wx_included_impl">1</set>
- </if>
-
-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 @@
-
- <!--
- Presents for building wxWidgets applications using Autoconf or GNU toosets.
--See wx.bkl for platform-independent notes.
-+See wx28.bkl for platform-independent notes.
-
- Usage:
- Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
-@@ -71,7 +71,7 @@
-
- <if cond="FORMAT not in ['gnu','autoconf']">
- <error>
-- Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
-+ Don't include presets/wx28_unix.bkl directly, use presets/wx28.bkl.
- </error>
- </if>
-
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