Browse Source

upgrading package: imagemagick 7.0.10.29 -> 7.1.0.5

master
parent
commit
8ca07c06fc
  1. 31
      imagemagick/imagemagick.patch
  2. 12
      imagemagick/imagemagick.spec

31
imagemagick/imagemagick.patch

@ -1,24 +1,17 @@
Index: PerlMagick/Makefile.PL.in
--- PerlMagick/Makefile.PL.in.orig 2016-05-01 17:35:44.261422000 +0200
+++ PerlMagick/Makefile.PL.in 2016-05-01 17:37:40.281425610 +0200
@@ -162,7 +162,7 @@
--- PerlMagick/Makefile.PL.in.orig 2021-09-02 20:04:00.091612000 +0200
+++ PerlMagick/Makefile.PL.in 2021-09-02 20:05:13.935623000 +0200
@@ -162,10 +162,10 @@
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
-my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
+my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore -lperl @MATH_LIBS@ @LDFLAGS@ -llcms -ltiff -lfreetype -llqr-1 -ljasper -ljpeg -lpng -lglib2 -lgobject2 -lgio2 -lbz2 -lxml2 -lintl -liconv -lz -lm';
-my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
+my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
Index: MagickCore/studio.h
--- MagickCore/studio.h.orig 2016-04-30 20:57:55.000000000 +0200
+++ MagickCore/studio.h 2016-05-01 18:40:18.861474680 +0200
@@ -168,7 +168,7 @@
#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT)
# include <sys/types.h>
# include <sys/stat.h>
-# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H)
+# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H) && !defined(__FreeBSD__)
# include <sys/timeb.h>
# endif
# if defined(MAGICKCORE_POSIX_SUPPORT)
-my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
-my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
+my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore $Config{'ldflags'} @LDFLAGS@";
+my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore $Config{'lddlflags'} @LDFLAGS@";
if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
my($Ipaths, $Lpaths) = AutodetectWin32gcc();

12
imagemagick/imagemagick.spec

@ -22,8 +22,8 @@
##
# package version
%define V_major 7.0.10
%define V_minor 29
%define V_major 7.1.0
%define V_minor 5
%define V_dist %{V_major}-%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@ -38,13 +38,13 @@ Class: BASE
Group: Graphics
License: ImageMagick
Version: %{V_opkg}
Release: 20200906
Release: 20210902
# package options
%option with_perl no
# list of sources
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{V_dist}.tar.bz2
Source0: https://download.imagemagick.org/ImageMagick/download/ImageMagick-%{V_dist}.tar.gz
Patch0: imagemagick.patch
# build information
@ -71,8 +71,8 @@ PreReq: perl
%track
prog imagemagick = {
version = %{V_dist}
url = ftp://ftp.imagemagick.org/pub/ImageMagick/
regex = ImageMagick-(\d+\.\d+\.\d+(-\d+)?)\.tar\.bz2
url = https://imagemagick.org/script/download.php
regex = ImageMagick-(\d+\.\d+\.\d+-\d+)
}
%prep

Loading…
Cancel
Save