[packages/ImageMagick/ImageMagick-6] up to 6.9.9-26; new SONAME
glen
glen at pld-linux.org
Thu Dec 14 22:53:27 CET 2017
commit e02caa4c33122d582f0fefee0e3ce5e46fed2e13
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Dec 14 19:32:20 2017 +0200
up to 6.9.9-26; new SONAME
ImageMagick-link.patch | 10 +++---
ImageMagick.spec | 16 ++++-----
config.patch | 14 ++++----
magick6.patch | 88 +++++++++++++++++++++++++-------------------------
4 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 23fae38..2c0ba4a 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -21,8 +21,8 @@
%bcond_without autotrace # Autotrace support in SVG module
%define origname ImageMagick
-%define ver 6.9.8
-%define pver 9
+%define ver 6.9.9
+%define pver 26
%include /usr/lib/rpm/macros.perl
Summary: Image display, conversion, and manipulation under X
Summary(de.UTF-8): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -35,12 +35,12 @@ Summary(tr.UTF-8): X altında resim gösterme, çevirme ve değişiklik yapma
Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window
Name: ImageMagick6
Version: %{ver}%{?pver:.%{pver}}
-Release: 2
+Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 08905a13d33101f349ad34837ff8d5a7
+# Source0-md5: af553c3dfad841748a6b49f44e354ba7
Patch0: config.patch
Patch1: %{origname}-link.patch
Patch2: %{origname}-libpath.patch
@@ -48,7 +48,7 @@ Patch3: %{origname}-ldflags.patch
Patch4: %{origname}-lt.patch
Patch5: perlmagick.patch
Patch6: magick6.patch
-URL: http://www.imagemagick.org/
+URL: https://legacy.imagemagick.org/
%{?with_opencl:BuildRequires: OpenCL-devel}
BuildRequires: OpenEXR-devel >= 1.0.6
BuildRequires: autoconf >= 2.69
@@ -1028,9 +1028,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog LICENSE AUTHORS.txt
%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.4
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.5
%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.4
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.5
%dir %{_libdir}/ImageMagick-%{ver}
%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1217,7 +1217,7 @@ rm -rf $RPM_BUILD_ROOT
%files c++
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.7
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.8
%files c++-devel
%defattr(644,root,root,755)
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index de9bda4..56094e6 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,5 +1,5 @@
---- ImageMagick-6.9.3-9/configure.ac~ 2016-05-04 14:14:35.000000000 +0300
-+++ ImageMagick-6.9.3-9/configure.ac 2016-05-04 14:17:04.636613415 +0300
+--- ImageMagick-6.9.9-26/configure.ac~ 2017-12-14 19:35:05.000000000 +0200
++++ ImageMagick-6.9.9-26/configure.ac 2017-12-14 19:40:54.689637300 +0200
@@ -1587,7 +1587,7 @@
AC_MSG_CHECKING([for X11])
AC_MSG_RESULT([])
@@ -18,15 +18,15 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3795,9 +3795,9 @@
+@@ -3879,9 +3879,9 @@
#
if test "$build_modules" != 'no'; then
- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
else
-- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
-+ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBPMUX_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
++ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
diff --git a/config.patch b/config.patch
index bdfa9df..53760b8 100644
--- a/config.patch
+++ b/config.patch
@@ -1,13 +1,15 @@
---- ImageMagick-6.9.8-9/config/policy.xml.orig 2017-06-03 21:42:26.347928053 +0200
-+++ ImageMagick-6.9.8-9/config/policy.xml 2017-06-03 21:46:36.687925194 +0200
-@@ -69,10 +69,20 @@
+--- ImageMagick-6.9.9-26/config/policy.xml~ 2017-12-06 03:32:01.000000000 +0200
++++ ImageMagick-6.9.9-26/config/policy.xml 2017-12-14 19:34:37.097613554 +0200
+@@ -71,10 +71,21 @@
<!-- <policy domain="resource" name="thread" value="4"/> -->
<!-- <policy domain="resource" name="throttle" value="0"/> -->
<!-- <policy domain="resource" name="time" value="3600"/> -->
-- <!-- <policy domain="resource" name="time" value="3600"/> -->
- <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
- <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
- <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+ <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+ <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+ <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="URL" />
+ <policy domain="coder" rights="none" pattern="HTTPS" />
@@ -22,6 +24,4 @@
+ <policy domain="coder" rights="none" pattern="PLT" />
+ <policy domain="path" rights="none" pattern="|*"/>
+ <policy domain="path" rights="none" pattern="@*"/> <!-- indirect reads not permitted -->
- <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
- <!-- <policy domain="cache" name="synchronize" value="True"/> -->
- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
+ </policymap>
diff --git a/magick6.patch b/magick6.patch
index fe73705..e5b2958 100644
--- a/magick6.patch
+++ b/magick6.patch
@@ -1,5 +1,5 @@
---- ImageMagick-6.9.7-0/magick/Magick-config.in~ 2016-12-18 14:34:45.000000000 +0100
-+++ ImageMagick-6.9.7-0/magick/Magick-config.in 2016-12-27 08:35:51.406200932 +0100
+--- ImageMagick-6.9.9-26/magick/Magick-config.in~ 2017-12-14 19:42:48.000000000 +0200
++++ ImageMagick-6.9.9-26/magick/Magick-config.in 2017-12-14 19:51:25.404235766 +0200
@@ -8,11 +8,11 @@
exec_prefix=@exec_prefix@
@@ -18,29 +18,29 @@
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
-- pkg-config --cflags MagickCore
-+ pkg-config --cflags MagickCore6
+- @PKG_CONFIG@ --cflags MagickCore
++ @PKG_CONFIG@ --cflags MagickCore6
;;
--cxxflags)
-- pkg-config --cflags MagickCore
-+ pkg-config --cflags MagickCore6
+- @PKG_CONFIG@ --cflags MagickCore
++ @PKG_CONFIG@ --cflags MagickCore6
;;
--cppflags)
-- pkg-config --cflags MagickCore
-+ pkg-config --cflags MagickCore6
+- @PKG_CONFIG@ --cflags MagickCore
++ @PKG_CONFIG@ --cflags MagickCore6
;;
--ldflags)
-- pkg-config --libs MagickCore
-+ pkg-config --libs MagickCore6
+- @PKG_CONFIG@ --libs MagickCore
++ @PKG_CONFIG@ --libs MagickCore6
;;
--libs)
-- pkg-config --libs MagickCore
-+ pkg-config --libs MagickCore6
+- @PKG_CONFIG@ --libs MagickCore
++ @PKG_CONFIG@ --libs MagickCore6
;;
*)
echo "${usage}" 1>&2
---- ImageMagick-6.9.7-0/magick/MagickCore-config.in~ 2016-12-18 14:34:45.000000000 +0100
-+++ ImageMagick-6.9.7-0/magick/MagickCore-config.in 2016-12-27 08:37:09.821645212 +0100
+--- ImageMagick-6.9.9-26/magick/MagickCore-config.in~ 2017-12-14 19:53:01.000000000 +0200
++++ ImageMagick-6.9.9-26/magick/MagickCore-config.in 2017-12-14 19:53:39.770926527 +0200
@@ -8,11 +8,11 @@
exec_prefix=@exec_prefix@
@@ -59,24 +59,24 @@
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
-- pkg-config --cflags MagickCore
-+ pkg-config --cflags MagickCore6
+- @PKG_CONFIG@ -config --cflags MagickCore
++ @PKG_CONFIG@ -config --cflags MagickCore6
;;
--cxxflags)
-- pkg-config --cflags MagickCore
-+ pkg-config --cflags MagickCore6
+- @PKG_CONFIG@ --cflags MagickCore
++ @PKG_CONFIG@ --cflags MagickCore6
;;
--cppflags)
-- pkg-config --cflags MagickCore
-+ pkg-config --cflags MagickCore6
+- @PKG_CONFIG@ --cflags MagickCore
++ @PKG_CONFIG@ --cflags MagickCore6
;;
--ldflags)
-- pkg-config --libs MagickCore
-+ pkg-config --libs MagickCore6
+- @PKG_CONFIG@ --libs MagickCore
++ @PKG_CONFIG@ --libs MagickCore6
;;
--libs)
-- pkg-config --libs MagickCore
-+ pkg-config --libs MagickCore6
+- @PKG_CONFIG@ --libs MagickCore
++ @PKG_CONFIG@ --libs MagickCore6
;;
*)
echo "${usage}" 1>&2
@@ -100,24 +100,24 @@
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
-- pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand6
+- @PKG_CONFIG@ --cflags MagickWand
++ @PKG_CONFIG@ --cflags MagickWand6
;;
--cxxflags)
-- pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand6
+- @PKG_CONFIG@ --cflags MagickWand
++ @PKG_CONFIG@ --cflags MagickWand6
;;
--cppflags)
-- pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand6
+- @PKG_CONFIG@ --cflags MagickWand
++ @PKG_CONFIG@ --cflags MagickWand6
;;
--ldflags)
-- pkg-config --libs MagickWand
-+ pkg-config --libs MagickWand6
+- @PKG_CONFIG@ --libs MagickWand
++ @PKG_CONFIG@ --libs MagickWand6
;;
--libs)
-- pkg-config --libs MagickWand
-+ pkg-config --libs MagickWand6
+- @PKG_CONFIG@ --libs MagickWand
++ @PKG_CONFIG@ --libs MagickWand6
;;
*)
echo "${usage}" 1>&2
@@ -141,24 +141,24 @@
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
-- pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand6
+- @PKG_CONFIG@ --cflags MagickWand
++ @PKG_CONFIG@ --cflags MagickWand6
;;
--cxxflags)
-- pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand6
+- @PKG_CONFIG@ --cflags MagickWand
++ @PKG_CONFIG@ --cflags MagickWand6
;;
--cppflags)
-- pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand6
+- @PKG_CONFIG@ --cflags MagickWand
++ @PKG_CONFIG@ --cflags MagickWand6
;;
--ldflags)
-- pkg-config --libs MagickWand
-+ pkg-config --libs MagickWand6
+- @PKG_CONFIG@ --libs MagickWand
++ @PKG_CONFIG@ --libs MagickWand6
;;
--libs)
-- pkg-config --libs MagickWand
-+ pkg-config --libs MagickWand6
+- @PKG_CONFIG@ --libs MagickWand
++ @PKG_CONFIG@ --libs MagickWand6
;;
*)
echo "${usage}" 1>&2
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/e02caa4c33122d582f0fefee0e3ce5e46fed2e13
More information about the pld-cvs-commit
mailing list