| 1 |
dirtyepic 07/10/25 13:11:55 |
| 2 |
|
| 3 |
Modified: wxGTK-2.6.4-collision.patch |
| 4 |
Log: |
| 5 |
Update collision patch to take into account new names of bakefile presets. |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: wxGTK-2.6.4-collision.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- wxGTK-2.6.4-collision.patch 9 Sep 2007 01:08:23 -0000 1.2 |
| 22 |
+++ wxGTK-2.6.4-collision.patch 25 Oct 2007 13:11:54 -0000 1.3 |
| 23 |
@@ -1,6 +1,24 @@ |
| 24 |
+diff -Naur wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl |
| 25 |
+--- wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl 2005-01-27 16:47:16.000000000 -0600 |
| 26 |
++++ wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-10-25 06:46:31.000000000 -0600 |
| 27 |
+@@ -15,12 +15,12 @@ |
| 28 |
+ <set var="__wx_included_impl">0</set> |
| 29 |
+ |
| 30 |
+ <if cond="FORMAT in ['autoconf','gnu']"> |
| 31 |
+- <include file="wx_unix.bkl"/> |
| 32 |
++ <include file="wx26_unix.bkl"/> |
| 33 |
+ <set var="__wx_included_impl">1</set> |
| 34 |
+ </if> |
| 35 |
+ |
| 36 |
+ <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'"> |
| 37 |
+- <include file="wx_win32.bkl"/> |
| 38 |
++ <include file="wx26_win32.bkl"/> |
| 39 |
+ <set var="__wx_included_impl">1</set> |
| 40 |
+ </if> |
| 41 |
+ |
| 42 |
diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.in |
| 43 |
---- wxPython-src-2.6.4.0-orig/Makefile.in 2007-09-08 18:58:36.000000000 -0600 |
| 44 |
-+++ wxPython-src-2.6.4.0/Makefile.in 2007-09-08 19:00:36.000000000 -0600 |
| 45 |
+--- wxPython-src-2.6.4.0-orig/Makefile.in 2007-10-25 06:35:58.000000000 -0600 |
| 46 |
++++ wxPython-src-2.6.4.0/Makefile.in 2007-10-25 06:37:21.000000000 -0600 |
| 47 |
@@ -26,6 +26,7 @@ |
| 48 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 49 |
INSTALL_DATA = @INSTALL_DATA@ |
| 50 |
@@ -44,7 +62,7 @@ |
| 51 |
|
| 52 |
diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/src/common/intl.cpp |
| 53 |
--- wxPython-src-2.6.4.0-orig/src/common/intl.cpp 2007-03-20 09:25:41.000000000 -0600 |
| 54 |
-+++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-09-08 19:00:36.000000000 -0600 |
| 55 |
++++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-10-25 06:37:21.000000000 -0600 |
| 56 |
@@ -1452,6 +1452,8 @@ |
| 57 |
m_initialized = false; |
| 58 |
} |
| 59 |
@@ -64,8 +82,8 @@ |
| 60 |
// there may be a catalog with toolkit specific overrides, it is not |
| 61 |
// an error if this does not exist |
| 62 |
diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in |
| 63 |
---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-09-08 18:58:36.000000000 -0600 |
| 64 |
-+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-09-08 19:01:46.000000000 -0600 |
| 65 |
+--- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-10-25 06:35:58.000000000 -0600 |
| 66 |
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-10-25 06:37:21.000000000 -0600 |
| 67 |
@@ -125,7 +125,6 @@ |
| 68 |
@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) |
| 69 |
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
-- |
| 74 |
gentoo-commits@g.o mailing list |
Archives