[packages/ImageMagick] - updated to 6.9.3-6 - updated link patch
qboosh
qboosh at pld-linux.org
Sun Mar 6 19:39:43 CET 2016
commit 279f52da395ce02e2b535f167b2dc7e168214f00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Mar 6 19:43:18 2016 +0100
- updated to 6.9.3-6
- updated link patch
ImageMagick-link.patch | 19 +++++++++----------
ImageMagick-lt.patch | 11 ++++-------
ImageMagick.spec | 6 +++---
3 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 58d7341..5e42755 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -17,8 +17,8 @@
# - module feautres:
%bcond_without autotrace # Autotrace support in SVG module
-%define ver 6.9.2
-%define pver 8
+%define ver 6.9.3
+%define pver 6
%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
@@ -36,7 +36,7 @@ Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 04bbc6be413549b8cf1c786d1f541064
+# Source0-md5: 9ee159aa6a7fdf661ebf03232a1d3730
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index ec8d5ec..2231ee8 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.8.4-8/configure.ac.orig 2013-04-08 21:28:19.045000250 +0200
-+++ ImageMagick-6.8.4-8/configure.ac 2013-04-09 15:46:42.263626622 +0200
-@@ -1519,7 +1519,7 @@
+--- ImageMagick-6.9.3-6/configure.ac.orig 2016-02-28 14:41:58.000000000 +0100
++++ ImageMagick-6.9.3-6/configure.ac 2016-03-06 18:26:16.362918286 +0100
+@@ -1587,7 +1587,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"
-@@ -1546,7 +1546,7 @@
+@@ -1614,7 +1614,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,16 +18,15 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3972,9 +3972,9 @@
+@@ -3748,9 +3748,9 @@
#
if test "$build_modules" != 'no'; then
-- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_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 $LQR_LIBS $FFTW_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"
+- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_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 $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 $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_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 $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_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 $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 $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/ImageMagick-lt.patch b/ImageMagick-lt.patch
index e9aef45..9a6f309 100644
--- a/ImageMagick-lt.patch
+++ b/ImageMagick-lt.patch
@@ -1,11 +1,9 @@
---- ImageMagick-6.6.6-7/configure.ac~ 2010-12-27 13:27:17.432375100 +0100
-+++ ImageMagick-6.6.6-7/configure.ac 2010-12-27 13:30:28.809041767 +0100
---- configure.ac~ 2014-11-26 10:14:50.000000000 +0100
-+++ configure.ac 2014-11-26 10:15:09.968560186 +0100
-@@ -512,10 +512,6 @@
+--- ImageMagick-6.9.3-6/configure.ac.orig 2016-03-06 18:30:04.449575381 +0100
++++ ImageMagick-6.9.3-6/configure.ac 2016-03-06 18:35:39.416227990 +0100
+@@ -489,10 +489,6 @@
CFLAGS="$CFLAGS $DEF_THREAD"
CXXFLAGS="$CXXFLAGS $DEF_THREAD"
- THREAD_LIBS="$PTHREAD_LIBS"
+ THREAD_LIBS="$PTHREAD_LIBS"
- if test "$CC" != "$PTHREAD_CC"; then
- AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
- CC="$PTHREAD_CC"
@@ -13,4 +11,3 @@
AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
fi
fi
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/279f52da395ce02e2b535f167b2dc7e168214f00
More information about the pld-cvs-commit
mailing list