[packages/ImageMagick] up to 7.0.6-9
glen
glen at pld-linux.org
Thu Aug 24 10:19:25 CEST 2017
commit c2a8e8fdc24c550b8b9f508e3ea6c5b93c204faa
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Aug 23 12:29:13 2017 +0300
up to 7.0.6-9
ImageMagick-link.patch | 10 +++++-----
ImageMagick.spec | 6 +++---
config.patch | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 53c8465..94de93c 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -20,8 +20,8 @@
# - module features:
%bcond_without autotrace # Autotrace support in SVG module
-%define ver 7.0.5
-%define pver 10
+%define ver 7.0.6
+%define pver 9
%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
@@ -39,7 +39,7 @@ Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: d5e87f7297a9ffc7b146bab4bbe8cc35
+# Source0-md5: 9fb25fa177c3b607425c8a300a2d3db0
Patch0: config.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index de9bda4..126afbd 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-7.0.6-9/configure.ac~ 2017-08-23 15:30:42.000000000 +0300
++++ ImageMagick-7.0.6-9/configure.ac 2017-08-23 15:52:29.056654862 +0300
@@ -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 @@
+@@ -3800,9 +3800,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 $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 $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 $RAW_R_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 2baf21c..1a15c03 100644
--- a/config.patch
+++ b/config.patch
@@ -1,15 +1,15 @@
---- ImageMagick-7.0.5-5/config/policy.xml~ 2017-04-24 20:18:37.000000000 +0300
-+++ ImageMagick-7.0.5-5/config/policy.xml 2017-05-03 18:23:29.877606299 +0300
-@@ -77,10 +77,21 @@
+--- ImageMagick-7.0.6-9/config/policy.xml~ 2017-08-21 03:31:20.000000000 +0300
++++ ImageMagick-7.0.6-9/config/policy.xml 2017-08-23 15:30:03.625671866 +0300
+@@ -70,10 +70,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="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" />
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/c2a8e8fdc24c550b8b9f508e3ea6c5b93c204faa
More information about the pld-cvs-commit
mailing list