[packages/ImageMagick] up to 7.0.8-14
glen
glen at pld-linux.org
Thu Oct 25 11:13:02 CEST 2018
commit 7da1a51527d2a12caa58e70f9b7ea210c27bf560
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Oct 24 20:01:58 2018 +0300
up to 7.0.8-14
ImageMagick-ldflags.patch | 15 +++++++--------
ImageMagick.spec | 8 ++++----
2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index ee213ea..a2a4c20 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -23,7 +23,7 @@
%define libpng_ver 2:1.6.34
%define ver 7.0.8
-%define pver 12
+%define pver 14
%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,12 +36,12 @@ Summary(tr.UTF-8): X altında resim gösterme, çevirme ve değişiklik yapma
Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window
Name: ImageMagick
Version: %{ver}%{?pver:.%{pver}}
-Release: 2
+Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
-Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 923f069934ddbcc51226fd83a444e994
+Source0: https://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.xz
+# Source0-md5: 6d6dc362db8bc3a4049be9aa9d34325c
Patch0: config.patch
Patch2: %{name}-libpath.patch
diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index 021e278..231f931 100644
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -1,14 +1,13 @@
---- ImageMagick-6.8.4-8/configure.ac.orig 2013-04-09 15:47:16.713625903 +0200
-+++ ImageMagick-6.8.4-8/configure.ac 2013-04-09 15:49:29.416956473 +0200
-@@ -3903,7 +3903,23 @@
+--- ImageMagick-7.0.8-14/configure.ac~ 2018-10-24 20:04:34.000000000 +0300
++++ ImageMagick-7.0.8-14/configure.ac 2018-10-24 20:06:02.215578717 +0300
+@@ -3939,7 +3939,22 @@
MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_LDFLAGS=""
-+new_LDFLAGS=
-+for flag in $LDFLAGS
-+do
++MAGICK_LDFLAGS=''
++new_LDFLAGS=''
++for flag in $LDFLAGS; do
+ case "$flag" in
+ -L/usr/lib|-L/usr/lib64|-L/usr/libx32)
+ ;;
@@ -22,6 +21,6 @@
+ esac
+done
+LDFLAGS="$new_LDFLAGS"
- MAGICK_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS"
AC_SUBST(MAGICK_CFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/7da1a51527d2a12caa58e70f9b7ea210c27bf560
More information about the pld-cvs-commit
mailing list