diff --git a/GraphicsMagick-1.3.42-multilib.patch b/GraphicsMagick-1.3.42-multilib.patch new file mode 100644 index 0000000000000000000000000000000000000000..7fab74d150a46dfd31c5f7315502b6d1e6e167b2 --- /dev/null +++ b/GraphicsMagick-1.3.42-multilib.patch @@ -0,0 +1,43 @@ +diff -up GraphicsMagick-1.3.42/Magick++/bin/GraphicsMagick++-config.in.multilib GraphicsMagick-1.3.42/Magick++/bin/GraphicsMagick++-config.in +--- GraphicsMagick-1.3.42/Magick++/bin/GraphicsMagick++-config.in.multilib 2024-02-27 18:06:19.540034131 -0700 ++++ GraphicsMagick-1.3.42/Magick++/bin/GraphicsMagick++-config.in 2024-02-27 18:08:09.207596284 -0700 +@@ -36,13 +36,13 @@ while test $# -gt 0; do + echo '@CXX@' + ;; + --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.42/magick/GraphicsMagick-config.in.multilib GraphicsMagick-1.3.42/magick/GraphicsMagick-config.in +--- GraphicsMagick-1.3.42/magick/GraphicsMagick-config.in.multilib 2024-02-27 18:06:19.540034131 -0700 ++++ GraphicsMagick-1.3.42/magick/GraphicsMagick-config.in 2024-02-27 18:07:36.006426095 -0700 +@@ -33,16 +33,16 @@ while test $# -gt 0; do + echo '@CC@' + ;; + --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.41.tar.xz b/GraphicsMagick-1.3.42.tar.xz similarity index 42% rename from GraphicsMagick-1.3.41.tar.xz rename to GraphicsMagick-1.3.42.tar.xz index 2ec3bd818b318b11398e0e21deff5c2fa03068ec..243334a7354c0b88c572d596197df340cd0e4fd8 100644 Binary files a/GraphicsMagick-1.3.41.tar.xz and b/GraphicsMagick-1.3.42.tar.xz differ diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 92da72ddd39bf7102a6af543c0600af676f97f0d..e6ddb5b5c19b45bc2d8790d6f3417ad00c594b01 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -25,7 +25,7 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.3.41 +Version: 1.3.42 Release: 1 License: MIT @@ -36,6 +36,8 @@ Source1: urw-fonts-1.0.7pre44.tar.bz2 Url: http://www.graphicsmagick.org/ Patch002: GraphicsMagick-1.3.31-perl_linkage.patch +# workaround multilib conflicts with GraphicsMagick-config +Patch003: GraphicsMagick-1.3.42-multilib.patch BuildRequires: bzip2-devel BuildRequires: freetype-devel @@ -159,7 +161,7 @@ rm -f urw-fonts/ChangeLog urw-fonts/README* urw-fonts/fonts* %endif %patch002 -p1 -b .perl_linkage - +%patch003 -p1 -b .multilib for f in ChangeLog.{2006,2008,2009,2012} NEWS.txt ; do iconv -f iso-8859-2 -t utf8 < $f > $f.utf8 touch -r $f $f.utf8 ; mv -f $f.utf8 $f @@ -338,6 +340,9 @@ exit 1 %{_mandir}/man3/* %changelog +* Fri Mar 22 2024 maqi - 1.3.42-1 +- Update to 1.3.42 + * Tue Aug 29 2023 xu_ping <707078654@qq.com> - 1.3.41-1 - Upgrade 1.3.41 to fix gm convert command failed.