diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/graphicsmagick-1-fix-xml2-config.patch | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/graphicsmagick-1-fix-xml2-config.patch')
| -rw-r--r-- | src/graphicsmagick-1-fix-xml2-config.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/graphicsmagick-1-fix-xml2-config.patch b/src/graphicsmagick-1-fix-xml2-config.patch index 04d273b..ab6d2d0 100644 --- a/src/graphicsmagick-1-fix-xml2-config.patch +++ b/src/graphicsmagick-1-fix-xml2-config.patch @@ -1,13 +1,14 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://sourceforge.net/tracker/?func=detail&aid=3130497&group_id=73485&atid=537937 -diff -r 89c7abc7139f configure.ac ---- a/configure.ac Mon Dec 06 15:42:37 2010 +0100 -+++ b/configure.ac Mon Dec 06 16:39:59 2010 +0100 -@@ -2135,12 +2135,13 @@ +diff --git a/configure.ac b/configure.ac +index 979d2c4..12d4555 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -2388,12 +2388,13 @@ then # Debian installs libxml headers under /usr/include/libxml2/libxml with # the shared library installed under /usr/lib, whereas the package # installs itself under $prefix/libxml and $prefix/lib. @@ -22,7 +23,7 @@ diff -r 89c7abc7139f configure.ac fi failed=0 passed=0 -@@ -2156,8 +2157,9 @@ +@@ -2416,8 +2417,9 @@ then LDFLAGS="$OLD_LDFLAGS" CPPFLAGS="$OLD_CPPFLAGS" else @@ -33,10 +34,11 @@ diff -r 89c7abc7139f configure.ac AC_DEFINE(HasXML,1,Define if you have XML library) AC_MSG_RESULT(yes) have_xml='yes' -diff -r 89c7abc7139f magick/GraphicsMagick.pc.in ---- a/magick/GraphicsMagick.pc.in Mon Dec 06 15:42:37 2010 +0100 -+++ b/magick/GraphicsMagick.pc.in Mon Dec 06 16:39:59 2010 +0100 -@@ -8,4 +8,5 @@ +diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in +index 5757b37..87e3fd4 100644 +--- a/magick/GraphicsMagick.pc.in ++++ b/magick/GraphicsMagick.pc.in +@@ -8,4 +8,5 @@ Name: GraphicsMagick Version: @PACKAGE_VERSION@ Description: GraphicsMagick image processing library Libs: -L${libdir} -lGraphicsMagick |