commit 178ae75fb2da9dc23d4becbb3fc0cbd7fe9a9570
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 15 20:24:34 2020 +0100
- updated to 6.9.11-0
- updated link,magick6 patches
ImageMagick-link.patch | 18 +++++++++---------
ImageMagick.spec | 13 ++++++-------
magick6.patch | 13 +------------
3 files changed, 16 insertions(+), 28 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 77adbcf..8066161 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -21,9 +21,8 @@
%bcond_without autotrace # Autotrace support in SVG module
%define origname ImageMagick
-%define ver 6.9.10
-%define pver 32
-%include /usr/lib/rpm/macros.perl
+%define ver 6.9.11
+%define pver 0
Summary: Image display, conversion, and manipulation under X
Summary(de.UTF-8): Darstellen, Konvertieren und Bearbeiten von Grafiken
unter X
Summary(es.UTF-8): Exhibidor, convertidor y manipulador de imágenes bajo X
@@ -35,12 +34,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: 3
+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: 6596cbc465858d71548cf4996adf6d79
+Source0:
https://www.imagemagick.org/download/releases/%{origname}-%{ver}-%{pver}.tar.xz
+# Source0-md5: de247df68cebc0d96cc4947576ea3c0a
Patch0: config.patch
Patch1: %{origname}-link.patch
Patch2: %{origname}-libpath.patch
@@ -88,7 +87,7 @@ BuildRequires: pango-devel >= 1:1.28.1
BuildRequires: perl-devel >= 1:5.8.1
BuildRequires: pkgconfig >= 1:0.20
BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.315
+BuildRequires: rpmbuild(macros) >= 1.745
BuildRequires: tar >= 1:1.22
# only checked for, but only supplied scripts/txt2html is used
#BuildRequires: txt2html
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 8fb30e6..aef942d 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.9.10-19/configure.ac.orig 2018-12-20 00:48:40.000000000
+0100
-+++ ImageMagick-6.9.10-19/configure.ac 2018-12-21 07:10:46.138445850 +0100
-@@ -1605,7 +1605,7 @@
+--- ImageMagick-6.9.11-0/configure.ac.orig 2020-03-07 00:52:18.000000000
+0100
++++ ImageMagick-6.9.11-0/configure.ac 2020-03-15 19:49:23.692781559 +0100
+@@ -1488,7 +1488,7 @@
AC_MSG_CHECKING([for X11])
AC_MSG_RESULT([])
LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,7 +9,7 @@
LIBS="$X11_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-@@ -1632,7 +1632,7 @@
+@@ -1515,7 +1515,7 @@
#
AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ;
AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[])
AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
@@ -18,15 +18,15 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3915,9 +3915,9 @@
+@@ -3860,9 +3860,9 @@
#
if test "$build_modules" != 'no'; then
-- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS
$LQR_LIBS $FFTW_LIBS $FLIF_LIBS $XML_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS
$X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS
$GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS"
-+ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS
$LQR_LIBS $FFTW_LIBS $XML_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS
$X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS
$GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS"
+- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS
$LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS
$X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS
$GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS"
++ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS
$LQR_LIBS $FFTW_LIBS $XML_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS
$X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS
$GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_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
$HEIF_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 $ZSTD_LIBS
$LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_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
$HEIF_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 $ZSTD_LIBS
$GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS"
+- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS
$FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS
$AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS
$HEIF_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 $ZSTD_LIBS
$LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS
$JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
++ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS
$FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS
$AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS
$HEIF_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 $ZSTD_LIBS
$GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
AC_SUBST(MAGICK_DEP_LIBS)
diff --git a/magick6.patch b/magick6.patch
index 829fd79..ff0c791 100644
--- a/magick6.patch
+++ b/magick6.patch
@@ -162,17 +162,6 @@
;;
*)
echo "${usage}" 1>&2
---- ImageMagick-6.9.7-0/wand/MagickWand.pc.in~ 2016-12-18 14:34:45.000000000
+0100
-+++ ImageMagick-6.9.7-0/wand/MagickWand.pc.in 2016-12-27 08:45:54.205764162
+0100
-@@ -9,7 +9,7 @@
- Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
- URL: https://www.imagemagick.org
- Version: @PACKAGE_VERSION@
--Requires: MagickCore
-+Requires: MagickCore6
- Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
- Libs: -L${libdir} -l${libname}
- Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
--- ImageMagick-6.9.7-0/wand/Wand.pc.in~ 2016-12-18 14:34:45.000000000
+0100
+++ ImageMagick-6.9.7-0/wand/Wand.pc.in 2016-12-27 08:46:32.786803064
+0100
@@ -9,7 +9,7 @@
@@ -180,7 +169,7 @@
URL: https://www.imagemagick.org
Version: @PACKAGE_VERSION@
-Requires: MagickCore
-+Requires: MagickCore6
++Requires: MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
Libs: -L${libdir} -l${libname}
Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/178ae75fb2da9dc23d4becbb3fc0cbd7fe9a9570
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
