Mercurial > mxe-octave
changeset 4139:fb311137f2f4
graphicsmagick: update to 1.3.23
* src/graphicsmagick.mk: update version, checksum
* src/graphicsmagick-1-fix-xml2-config.patch: update patch
| author | John Donoghue |
|---|---|
| date | Wed, 04 May 2016 08:42:42 -0400 |
| parents | f6f4a77c6466 |
| children | d38d0e08ef4c |
| files | src/graphicsmagick-1-fix-xml2-config.patch src/graphicsmagick.mk |
| diffstat | 2 files changed, 2 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/src/graphicsmagick-1-fix-xml2-config.patch Wed May 04 08:42:41 2016 -0400 +++ b/src/graphicsmagick-1-fix-xml2-config.patch Wed May 04 08:42:42 2016 -0400 @@ -1,39 +1,3 @@ -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 --git a/configure.ac b/configure.ac -index 979d2c4..12d4555 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -2373,12 +2373,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. -- xml2_prefix=`xml2-config --prefix` -+ xml2_prefix=`"$xml2_config" --prefix` - if test -d "${xml2_prefix}/include/libxml2" - then - CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2" - fi - LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib" -+ LIBS="$LIBS `"$xml2_config" --libs`" - fi - failed=0 - passed=0 -@@ -2401,8 +2402,9 @@ then - LDFLAGS="$OLD_LDFLAGS" - CPPFLAGS="$OLD_CPPFLAGS" - else -- LIB_XML='-lxml2' -+ LIB_XML=`"$xml2_config" --libs` - LIBS="$LIB_XML $LIBS" -+ CPPFLAGS="$CPPFLAGS `"$xml2_config" --cflags`" - AC_DEFINE(HasXML,1,Define if you have XML library) - AC_MSG_RESULT(yes) - have_xml='yes' diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in index 5757b37..87e3fd4 100644 --- a/magick/GraphicsMagick.pc.in
--- a/src/graphicsmagick.mk Wed May 04 08:42:41 2016 -0400 +++ b/src/graphicsmagick.mk Wed May 04 08:42:42 2016 -0400 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.21 -$(PKG)_CHECKSUM := bd3c543520b810999348e52d4abad6b59069f78b +$(PKG)_VERSION := 1.3.23 +$(PKG)_CHECKSUM := 9075a6030d305d675847cbd6755c0c2318623854 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)