diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2007-09-01 21:44:57 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2007-09-01 21:44:57 +0000 |
| commit | 7bfefeeb8e275ea5686defc1cd9224e7c8908837 (patch) | |
| tree | 193ad5b488a0574b7219cbc9271fd409b9b1ad47 /x11-libs | |
| parent | revert whitespace slippage (diff) | |
| download | gentoo-2-7bfefeeb8e275ea5686defc1cd9224e7c8908837.tar.gz gentoo-2-7bfefeeb8e275ea5686defc1cd9224e7c8908837.tar.bz2 gentoo-2-7bfefeeb8e275ea5686defc1cd9224e7c8908837.zip | |
Convert patch from DOS to Unix newlines.
(Portage version: 2.1.3.7)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch | 26 |
2 files changed, 17 insertions, 15 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index fbca136b7eb1..d9f689c63f95 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.145 2007/09/01 08:50:37 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.146 2007/09/01 21:44:57 dirtyepic Exp $ + + 01 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> + files/wxGTK-2.6.4.0-wxrc_link_fix.patch: + Convert patch from DOS to Unix newlines. *wxGTK-2.6.4.0 (01 Sep 2007) diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch index a4f12ca62af6..e9db3480b0f0 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch @@ -1,14 +1,12 @@ -Fix bug 150435 - wxrc build fails because it tries to link against system wx libraries, if present,
- due to LDFLAGS containing -L to /usr/lib as a symlink - move $LDFLAGS further in the end
-
---- utils/wxrc/Makefile.in.orig 2007-01-10 13:25:40.000000000 +0200
-+++ utils/wxrc/Makefile.in 2007-01-10 13:27:56.000000000 +0200
-@@ -117,7 +117,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_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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 -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-01 15:03:10.000000000 -0600 ++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-09-01 15:06:56.000000000 -0600 +@@ -117,7 +117,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_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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) + |