From 9cc9f893a46a2bb5294e78d8541b37e9d1f14eb9 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sat, 13 Feb 2021 23:00:45 -0800 Subject: [PATCH] GraphicsMagick: update to 1.3.36 Assorted bug fixes, enhancements, and build cleanups, full list here: http://www.graphicsmagick.org/NEWS.html#december-26-2020 Additionally, PerlMagick is built but tests are disabled since there is currently an installation order issue with the tests. Specifically, the PerlMagick tests require GraphicsMagick to be installed for the tests to pass but the tests are run as part of the main suite. See: https://sourceforge.net/p/graphicsmagick/bugs/580/ for more details. --- .../patches/disable_perlmagick_tests.patch | 24 +++++++++++++++++++ srcpkgs/GraphicsMagick/template | 8 +++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch diff --git a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch new file mode 100644 index 0000000000..2080d6da7c --- /dev/null +++ b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch @@ -0,0 +1,24 @@ +# workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/ + +--- Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800 ++++ Makefile.am 2021-02-14 00:46:48.431547444 -0800 +@@ -79,7 +79,6 @@ + + # Tests to run + TESTS = \ +- $(PERLMAGICK_TESTS) \ + $(TESTS_TESTS) \ + $(MAGICKPP_TESTS) \ + $(WAND_TESTS) \ + +--- Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800 ++++ Makefile.in 2021-02-14 00:50:19.996138472 -0800 +@@ -4767,7 +4767,7 @@ + @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl + @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local + #PERLMAGICK_CHECK_LOCAL_TARGETS = check-perl +-@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh ++#@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh + @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = perl-build + + #PERLMAGICK_CHECKSCRIPTS = perl-build diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 945ed5c3ae..35f5269eac 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,10 +1,10 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.35 -revision=2 +version=1.3.36 +revision=1 build_style=gnu-configure configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1 - --with-modules --with-perl --without-lcms --without-jp2 --enable-shared --disable-static" + --with-modules --with-perl --without-jp2 --enable-shared --disable-static" hostmakedepends="pkg-config perl" # libraries listed in GraphicsMagick++-config --libs _develdepends="lcms2-devel freetype-devel libXext-devel libSM-devel libICE-devel @@ -19,7 +19,7 @@ license="MIT" homepage="http://www.graphicsmagick.org/" changelog="http://www.graphicsmagick.org/NEWS.html" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" -checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055 +checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563 keep_libtool_archives=yes post_install() {