1 |
dirtyepic 07/09/09 01:08:23 |
2 |
|
3 |
Modified: wxGTK-2.6.4-collision.patch |
4 |
Log: |
5 |
Update collision patch to handle wxrc. |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 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.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.2&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.1&r2=1.2 |
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.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- wxGTK-2.6.4-collision.patch 1 Sep 2007 08:50:37 -0000 1.1 |
22 |
+++ wxGTK-2.6.4-collision.patch 9 Sep 2007 01:08:23 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.in |
25 |
---- wxPython-src-2.6.4.0-orig/Makefile.in 2007-07-29 11:47:53.000000000 -0600 |
26 |
-+++ wxPython-src-2.6.4.0/Makefile.in 2007-07-29 12:35:22.000000000 -0600 |
27 |
+--- wxPython-src-2.6.4.0-orig/Makefile.in 2007-09-08 18:58:36.000000000 -0600 |
28 |
++++ wxPython-src-2.6.4.0/Makefile.in 2007-09-08 19:00:36.000000000 -0600 |
29 |
@@ -26,6 +26,7 @@ |
30 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
31 |
INSTALL_DATA = @INSTALL_DATA@ |
32 |
@@ -44,7 +44,7 @@ |
33 |
|
34 |
diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/src/common/intl.cpp |
35 |
--- wxPython-src-2.6.4.0-orig/src/common/intl.cpp 2007-03-20 09:25:41.000000000 -0600 |
36 |
-+++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-07-29 12:29:45.000000000 -0600 |
37 |
++++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-09-08 19:00:36.000000000 -0600 |
38 |
@@ -1452,6 +1452,8 @@ |
39 |
m_initialized = false; |
40 |
} |
41 |
@@ -63,3 +63,14 @@ |
42 |
|
43 |
// there may be a catalog with toolkit specific overrides, it is not |
44 |
// an error if this does not exist |
45 |
+diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in |
46 |
+--- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-09-08 18:58:36.000000000 -0600 |
47 |
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-09-08 19:01:46.000000000 -0600 |
48 |
+@@ -125,7 +125,6 @@ |
49 |
+ @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) |
50 |
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
51 |
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
52 |
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
53 |
+ |
54 |
+ @COND_USE_XRC_1@uninstall_wxrc: |
55 |
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |
56 |
|
57 |
|
58 |
|
59 |
-- |
60 |
gentoo-commits@g.o mailing list |