diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2008-02-08 00:58:49 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2008-02-08 00:58:49 +0000 |
| commit | 46f85f838e11a5cf2bd3b23860fdcb663a07b52a (patch) | |
| tree | d51782f2097647f96304bf789279e16d4cd32f56 /x11-libs/wxGTK | |
| parent | Create symlinks for wx* bakefile prefix files based on currently selected (diff) | |
| download | gentoo-2-46f85f838e11a5cf2bd3b23860fdcb663a07b52a.tar.gz gentoo-2-46f85f838e11a5cf2bd3b23860fdcb663a07b52a.tar.bz2 gentoo-2-46f85f838e11a5cf2bd3b23860fdcb663a07b52a.zip | |
Drop the bakefile hunks of the collision patches that don't work as
expected. Now handled by eselect-wxwidgets.
(Portage version: 2.1.4.1)
Diffstat (limited to 'x11-libs/wxGTK')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch | 18 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch | 39 |
3 files changed, 6 insertions, 58 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 2b1846ac220e..be1617c6f857 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.185 2008/01/29 19:23:21 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.186 2008/02/08 00:58:48 dirtyepic Exp $ + + 08 Feb 2008; Ryan Hill <dirtyepic@gentoo.org> + files/wxGTK-2.6.4-collision.patch, files/wxGTK-2.8.4-collision.patch: + Drop the bakefile hunks of the collision patches that don't work as + expected. Now handled by eselect-wxwidgets. 29 Jan 2008; nixnut <nixnut@gentoo.org> wxGTK-2.6.4.0-r3.ebuild, wxGTK-2.8.7.1-r1.ebuild: 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 77b85a51a430..ad5dae3f502c 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch @@ -1,21 +1,3 @@ -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-12-17 19:39:44.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-12-17 19:38:16.000000000 -0600 +++ wxPython-src-2.6.4.0/Makefile.in 2007-12-17 19:41:49.000000000 -0600 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 |