diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2007-12-03 19:16:07 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2007-12-03 19:16:07 +0000 |
| commit | c49b4f5a9b554d7fa3551a73462bb8cc558b91cd (patch) | |
| tree | ce4cb4286c99792b82a3b38e58e29d6df995e260 /x11-libs | |
| parent | Version bump (diff) | |
| download | gentoo-2-c49b4f5a9b554d7fa3551a73462bb8cc558b91cd.tar.gz gentoo-2-c49b4f5a9b554d7fa3551a73462bb8cc558b91cd.tar.bz2 gentoo-2-c49b4f5a9b554d7fa3551a73462bb8cc558b91cd.zip | |
Port wxrc link patch to 2.8, where it turns out it hasn't been applied yet
like I thought. Thanks to devurandom.
(Portage version: 2.1.4_rc6)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch | 12 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 5d5f6a2af8e1..ea471a44a8f0 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,11 @@ # 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.164 2007/11/30 00:56:39 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.165 2007/12/03 19:16:06 dirtyepic Exp $ + + 03 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> + +files/wxGTK-2.8.6-wxrc_link_fix.patch, wxGTK-2.8.6.1.ebuild: + Port wxrc link patch to 2.8, where it turns out it hasn't been applied yet + like I thought. Thanks to devurandom. 30 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r2.ebuild, wxGTK-2.8.6.1.ebuild: diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch new file mode 100644 index 000000000000..bee51913b403 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch @@ -0,0 +1,12 @@ +diff -Naur wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.1/utils/wxrc/Makefile.in +--- wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in 2007-12-03 12:59:33.000000000 -0600 ++++ wxPython-src-2.8.6.1/utils/wxrc/Makefile.in 2007-12-03 13:02:01.000000000 -0600 +@@ -108,7 +108,7 @@ + rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + + @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS) +-@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) ++@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE) + @COND_USE_XRC_1@ + @COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd) + diff --git a/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild index b50a32a0777c..5dbafab5a9fb 100644 --- a/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild,v 1.2 2007/11/30 00:56:39 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild,v 1.3 2007/12/03 19:16:06 dirtyepic Exp $ EAPI=1 @@ -66,6 +66,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch epatch "${FILESDIR}"/${PN}-2.8.4-collision.patch + epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch # Patches specific to this Version |