* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.6.4-collision.patch
@ 2007-09-09 1:08 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2007-09-09 1:08 UTC (permalink / raw
To: gentoo-commits
dirtyepic 07/09/09 01:08:23
Modified: wxGTK-2.6.4-collision.patch
Log:
Update collision patch to handle wxrc.
(Portage version: 2.1.3.9)
Revision Changes Path
1.2 x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.2&view=markup
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
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
Index: wxGTK-2.6.4-collision.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.6.4-collision.patch 1 Sep 2007 08:50:37 -0000 1.1
+++ wxGTK-2.6.4-collision.patch 9 Sep 2007 01:08:23 -0000 1.2
@@ -1,6 +1,6 @@
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-07-29 11:47:53.000000000 -0600
-+++ wxPython-src-2.6.4.0/Makefile.in 2007-07-29 12:35:22.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/Makefile.in 2007-09-08 18:58:36.000000000 -0600
++++ wxPython-src-2.6.4.0/Makefile.in 2007-09-08 19:00:36.000000000 -0600
@@ -26,6 +26,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -44,7 +44,7 @@
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-07-29 12:29:45.000000000 -0600
++++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-09-08 19:00:36.000000000 -0600
@@ -1452,6 +1452,8 @@
m_initialized = false;
}
@@ -63,3 +63,14 @@
// 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-09-08 18:58:36.000000000 -0600
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-09-08 19:01:46.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)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.6.4-collision.patch
@ 2007-10-25 13:11 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2007-10-25 13:11 UTC (permalink / raw
To: gentoo-commits
dirtyepic 07/10/25 13:11:55
Modified: wxGTK-2.6.4-collision.patch
Log:
Update collision patch to take into account new names of bakefile presets.
(Portage version: 2.1.3.16)
Revision Changes Path
1.3 x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.3&view=markup
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
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
Index: wxGTK-2.6.4-collision.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wxGTK-2.6.4-collision.patch 9 Sep 2007 01:08:23 -0000 1.2
+++ wxGTK-2.6.4-collision.patch 25 Oct 2007 13:11:54 -0000 1.3
@@ -1,6 +1,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
+--- wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl 2005-01-27 16:47:16.000000000 -0600
++++ wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-10-25 06:46:31.000000000 -0600
+@@ -15,12 +15,12 @@
+ <set var="__wx_included_impl">0</set>
+
+ <if cond="FORMAT in ['autoconf','gnu']">
+- <include file="wx_unix.bkl"/>
++ <include file="wx26_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="wx26_win32.bkl"/>
+ <set var="__wx_included_impl">1</set>
+ </if>
+
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-09-08 18:58:36.000000000 -0600
-+++ wxPython-src-2.6.4.0/Makefile.in 2007-09-08 19:00:36.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/Makefile.in 2007-10-25 06:35:58.000000000 -0600
++++ wxPython-src-2.6.4.0/Makefile.in 2007-10-25 06:37:21.000000000 -0600
@@ -26,6 +26,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -44,7 +62,7 @@
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-09-08 19:00:36.000000000 -0600
++++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-10-25 06:37:21.000000000 -0600
@@ -1452,6 +1452,8 @@
m_initialized = false;
}
@@ -64,8 +82,8 @@
// 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-09-08 18:58:36.000000000 -0600
-+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-09-08 19:01:46.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-10-25 06:35:58.000000000 -0600
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-10-25 06:37:21.000000000 -0600
@@ -125,7 +125,6 @@
@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-25 13:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-09 1:08 [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.6.4-collision.patch Ryan Hill (dirtyepic)
-- strict thread matches above, loose matches on Subject: below --
2007-10-25 13:11 Ryan Hill (dirtyepic)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox