Mercurial > mxe-octave
changeset 6014:7ac858194666
graphicsmagick: update to v1.3.37
* src/graphicsmagick.mk: update version, checmsum
* src/graphicsmagick-2-dynamicpath.patch: update patch
* src/graphicsmagick-3-user32.patch: remove file
* dist-files.mk: remove deleted file ref
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 16 Dec 2021 17:21:44 -0500 |
| parents | 8d1bfd50950d |
| children | 6f8def83bcf7 |
| files | dist-files.mk src/graphicsmagick-2-dynamicpath.patch src/graphicsmagick-3-user32.patch src/graphicsmagick.mk |
| diffstat | 4 files changed, 13 insertions(+), 86 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Tue Dec 14 08:42:06 2021 -0500 +++ b/dist-files.mk Thu Dec 16 17:21:44 2021 -0500 @@ -159,7 +159,6 @@ gnutls.mk \ graphicsmagick-1-fix-xml2-config.patch \ graphicsmagick-2-dynamicpath.patch \ - graphicsmagick-3-user32.patch \ graphicsmagick-test.cpp \ graphicsmagick.mk \ gsl-test.c \
--- a/src/graphicsmagick-2-dynamicpath.patch Tue Dec 14 08:42:06 2021 -0500 +++ b/src/graphicsmagick-2-dynamicpath.patch Thu Dec 16 17:21:44 2021 -0500 @@ -1,7 +1,7 @@ -diff -ur GraphicsMagick-1.3.30.orig/magick/blob.c GraphicsMagick-1.3.30/magick/blob.c ---- GraphicsMagick-1.3.30.orig/magick/blob.c 2018-07-16 08:55:01.552444311 -0400 -+++ GraphicsMagick-1.3.30/magick/blob.c 2018-07-17 09:27:05.584144673 -0400 -@@ -1955,6 +1955,29 @@ +diff -ur GraphicsMagick-1.3.37.orig/magick/blob.c GraphicsMagick-1.3.37/magick/blob.c +--- GraphicsMagick-1.3.37.orig/magick/blob.c 2021-12-14 12:59:54.946462559 -0500 ++++ GraphicsMagick-1.3.37/magick/blob.c 2021-12-14 13:05:57.022604525 -0500 +@@ -1975,6 +1975,29 @@ AddConfigurePath(path_map,&path_index,MagickLibConfigPath,exception); # endif /* defined(MagickLibConfigPath) */ @@ -31,14 +31,13 @@ # if defined(MSWINDOWS) && !(defined(MagickLibConfigPath) || defined(MagickShareConfigPath)) { char -Only in GraphicsMagick-1.3.30/magick: .blob.c.swp -diff -ur GraphicsMagick-1.3.30.orig/magick/module.c GraphicsMagick-1.3.30/magick/module.c ---- GraphicsMagick-1.3.30.orig/magick/module.c 2018-07-16 08:55:01.539443999 -0400 -+++ GraphicsMagick-1.3.30/magick/module.c 2018-07-17 08:22:22.161123799 -0400 -@@ -1021,6 +1021,33 @@ - start += length+1; +diff -ur GraphicsMagick-1.3.37.orig/magick/module.c GraphicsMagick-1.3.37/magick/module.c +--- GraphicsMagick-1.3.37.orig/magick/module.c 2021-12-14 12:59:54.935462099 -0500 ++++ GraphicsMagick-1.3.37/magick/module.c 2021-12-14 13:08:20.667611735 -0500 +@@ -1036,6 +1036,33 @@ } } + +#if defined(MSWINDOWS) + { + char buf[FILENAME_MAX+100]; @@ -65,7 +64,7 @@ + } + } +#endif -+ - ++ #if defined(UseInstalledMagick) # if defined(MagickCoderModulesPath) + {
--- a/src/graphicsmagick-3-user32.patch Tue Dec 14 08:42:06 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -diff -ur GraphicsMagick-1.3.36.orig/configure.ac GraphicsMagick-1.3.36/configure.ac ---- GraphicsMagick-1.3.36.orig/configure.ac 2021-01-01 09:35:17.966994198 -0500 -+++ GraphicsMagick-1.3.36/configure.ac 2021-01-01 14:21:04.736125338 -0500 -@@ -2752,7 +2752,8 @@ - found_libgdi32=0 - AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) - AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include <windows.h>]) -- AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,) -+ AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr $found_libuser32 + 1`],[],[]) -+ AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + 1`],[],[]) - if test $found_libgdi32 -gt 0 - then - passed=`expr $passed + 1` -@@ -2767,7 +2768,7 @@ - AC_MSG_RESULT([no -- some components failed test]) - have_gdi32='no (failed tests)' - else -- LIB_GDI32='-lgdi32' -+ LIB_GDI32='-lgdi32 -luser32' - LIBS="$LIB_GDI32 $LIBS" - AC_DEFINE([HasWINGDI32],[1],[Define to use the Windows GDI32 library]) - AC_MSG_RESULT([yes]) -diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.c GraphicsMagick-1.3.36/magick/nt_feature.c ---- GraphicsMagick-1.3.36.orig/magick/nt_feature.c 2021-01-01 09:35:18.045998572 -0500 -+++ GraphicsMagick-1.3.36/magick/nt_feature.c 2021-01-01 14:22:55.233205368 -0500 -@@ -78,6 +78,7 @@ - % - % - */ -+#if defined(HasWINGDI32) - MagickExport void *CropImageToHBITMAP(Image *image, - const RectangleInfo *geometry,ExceptionInfo *exception) - { -@@ -217,6 +218,7 @@ - - return (void *)bitmapH; - } -+#endif - - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -612,6 +614,7 @@ - % - % - */ -+#if defined(HasWINGDI32) - MagickExport void *ImageToHBITMAP(Image* image) - { - unsigned long -@@ -696,5 +699,6 @@ - - return (void *)bitmapH; - } -+#endif - - #endif -diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.h GraphicsMagick-1.3.36/magick/nt_feature.h ---- GraphicsMagick-1.3.36.orig/magick/nt_feature.h 2021-01-01 09:35:18.038998185 -0500 -+++ GraphicsMagick-1.3.36/magick/nt_feature.h 2021-01-01 14:23:42.008779169 -0500 -@@ -23,9 +23,11 @@ - extern MagickExport char - *NTRegistryKeyLookup(const char *key); - -+#if defined(HasWINGDI32) - extern MagickExport void - *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *), - *ImageToHBITMAP(Image* image); -+#endif - - #if !defined(XS_VERSION) -
--- a/src/graphicsmagick.mk Tue Dec 14 08:42:06 2021 -0500 +++ b/src/graphicsmagick.mk Thu Dec 16 17:21:44 2021 -0500 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.36 -$(PKG)_CHECKSUM := df45052bf485407ad4fb7d3b9b305d3e5ebb14e5 +$(PKG)_VERSION := 1.3.37 +$(PKG)_CHECKSUM := 94e0103f7d2286d1ba46c633d68ab0e1bfa2b2d3 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)