diff --git a/Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch b/Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch deleted file mode 100644 index d2d407f22af6f41af1afbe6a2361ecd076144f84..0000000000000000000000000000000000000000 --- a/Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5ce2dc8c917812a029b2328ca34381f32952fcc6 Mon Sep 17 00:00:00 2001 -From: cherry530 <707078654@qq.com> -Date: Fri, 4 Aug 2023 15:49:43 +0800 -Subject: [PATCH] Disable LOSSLESS_SUPPORTED checks for libjpeg turbo because - they break with their latest code. - -Signed-off-by: cherry530 <707078654@qq.com> ---- - coders/jpeg.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/coders/jpeg.c b/coders/jpeg.c -index e0ecb09..c7b30d9 100644 ---- a/coders/jpeg.c -+++ b/coders/jpeg.c -@@ -954,7 +954,7 @@ EstimateJPEGQuality(const struct jpeg_decompress_struct *jpeg_info, - i; - - save_quality=0; --#ifdef D_LOSSLESS_SUPPORTED -+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED) - if (image->compression==LosslessJPEGCompression) - { - save_quality=100; -@@ -1461,7 +1461,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, - } - #endif - #if (JPEG_LIB_VERSION >= 61) && defined(D_PROGRESSIVE_SUPPORTED) --#ifdef D_LOSSLESS_SUPPORTED -+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED) - image->interlace= - jpeg_info.process == JPROC_PROGRESSIVE ? LineInterlace : NoInterlace; - image->compression=jpeg_info.process == JPROC_LOSSLESS ? --- -2.33.0 - diff --git a/GraphicsMagick-1.3.16-multilib.patch b/GraphicsMagick-1.3.16-multilib.patch deleted file mode 100644 index e3c8e90305652d75e7dd46ebb12816fd388f3aec..0000000000000000000000000000000000000000 --- a/GraphicsMagick-1.3.16-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in.multilib GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in ---- GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in.multilib 2011-11-12 14:39:22.000000000 -0600 -+++ GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in 2012-06-24 11:25:12.603862643 -0500 -@@ -33,13 +33,13 @@ while test $# -gt 0; do - echo '@MAGICK_API_CPPFLAGS@' - ;; - --cxxflags) -- echo '@CXXFLAGS@' -+ echo '' - ;; - --ldflags) -- echo '@MAGICK_API_LDFLAGS@' -+ echo '' - ;; - --libs) -- echo '-lGraphicsMagick++ @MAGICK_API_LIBS@' -+ echo '-lGraphicsMagick++' - ;; - *) - echo "${usage}" 1>&2 -diff -up GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in.multilib GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in ---- GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in.multilib 2011-11-12 14:39:26.000000000 -0600 -+++ GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in 2012-06-24 11:14:55.947571850 -0500 -@@ -30,16 +30,16 @@ while test $# -gt 0; do - echo @PACKAGE_VERSION@ - ;; - --cflags) -- echo '@CFLAGS@' -+ echo '' - ;; - --cppflags) - echo '@MAGICK_API_CPPFLAGS@' - ;; - --ldflags) -- echo '@MAGICK_API_LDFLAGS@' -+ echo '' - ;; - --libs) -- echo '@MAGICK_API_LIBS@' -+ echo '-lGraphicsMagick' - ;; - *) - echo "${usage}" 1>&2 diff --git a/GraphicsMagick-1.3.40.tar.xz b/GraphicsMagick-1.3.41.tar.xz similarity index 43% rename from GraphicsMagick-1.3.40.tar.xz rename to GraphicsMagick-1.3.41.tar.xz index 72d15765f4f69fc0a6b44598c2753288ef696dff..2ec3bd818b318b11398e0e21deff5c2fa03068ec 100644 Binary files a/GraphicsMagick-1.3.40.tar.xz and b/GraphicsMagick-1.3.41.tar.xz differ diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index ba1e78e1eb1a1a6477d0f8a2f34a9f3a822a53f9..92da72ddd39bf7102a6af543c0600af676f97f0d 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -25,8 +25,8 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.3.40 -Release: 2 +Version: 1.3.41 +Release: 1 License: MIT Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz @@ -35,9 +35,7 @@ Source1: urw-fonts-1.0.7pre44.tar.bz2 #S1 https://gitee.com/src-openeuler/urw-base35-fonts.git Url: http://www.graphicsmagick.org/ -Patch001: GraphicsMagick-1.3.16-multilib.patch Patch002: GraphicsMagick-1.3.31-perl_linkage.patch -Patch003: Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch BuildRequires: bzip2-devel BuildRequires: freetype-devel @@ -161,8 +159,6 @@ rm -f urw-fonts/ChangeLog urw-fonts/README* urw-fonts/fonts* %endif %patch002 -p1 -b .perl_linkage -%patch001 -p1 -b .multilib -%patch003 -p1 for f in ChangeLog.{2006,2008,2009,2012} NEWS.txt ; do iconv -f iso-8859-2 -t utf8 < $f > $f.utf8 @@ -342,6 +338,9 @@ exit 1 %{_mandir}/man3/* %changelog +* Tue Aug 29 2023 xu_ping <707078654@qq.com> - 1.3.41-1 +- Upgrade 1.3.41 to fix gm convert command failed. + * Fri Aug 04 2023 xu_ping <707078654@qq.com> - 1.3.40-2 - fix build error due to LOSSLESS_SUPPORTED is broken