diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2007-10-25 13:11:54 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2007-10-25 13:11:54 +0000 |
| commit | 47f5ef256d4b797323b809f496a23a9c9648f9d8 (patch) | |
| tree | b6f923207256135a986067e7ae1e56f1e48a9dea /x11-libs | |
| parent | Fix HOMEPAGE (diff) | |
| download | gentoo-2-47f5ef256d4b797323b809f496a23a9c9648f9d8.tar.gz gentoo-2-47f5ef256d4b797323b809f496a23a9c9648f9d8.tar.bz2 gentoo-2-47f5ef256d4b797323b809f496a23a9c9648f9d8.zip | |
Update collision patch to take into account new names of bakefile presets.
(Portage version: 2.1.3.16)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch | 28 |
2 files changed, 28 insertions, 6 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index ae8ee1f8e901..3f487a82dc89 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.150 2007/10/25 04:06:32 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.151 2007/10/25 13:11:54 dirtyepic Exp $ + + 25 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> + files/wxGTK-2.6.4-collision.patch: + Update collision patch to take into account new names of bakefile presets. 25 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> ChangeLog, Manifest: Fix docs installation. diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch index 1d4e151ea007..26287794abc9 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch @@ -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/Makefile.in wxPython-src-2.6.4.0/Makefile.i 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 @@ diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.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.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) |