Compare commits
10 Commits
86ee3eaf4f
...
b3162ffd66
Author | SHA1 | Date |
---|---|---|
|
b3162ffd66 | |
|
53fa9b06fe | |
|
079735b226 | |
|
aae782fe0a | |
|
1fe68fa40c | |
|
ed58afe7c9 | |
|
ef9c4f9c59 | |
|
4c67a878eb | |
|
5d94b42a37 | |
|
5026cdf4ac |
|
@ -34,3 +34,9 @@
|
||||||
/ImageMagick-7.1.1-10.tar.xz.asc
|
/ImageMagick-7.1.1-10.tar.xz.asc
|
||||||
/ImageMagick-7.1.1-11.tar.xz
|
/ImageMagick-7.1.1-11.tar.xz
|
||||||
/ImageMagick-7.1.1-11.tar.xz.asc
|
/ImageMagick-7.1.1-11.tar.xz.asc
|
||||||
|
/ImageMagick-7.1.1-13.tar.xz
|
||||||
|
/ImageMagick-7.1.1-13.tar.xz.asc
|
||||||
|
/ImageMagick-7.1.1-15.tar.xz
|
||||||
|
/ImageMagick-7.1.1-15.tar.xz.asc
|
||||||
|
/ImageMagick-7.1.1-26.tar.xz
|
||||||
|
/ImageMagick-7.1.1-26.tar.xz.asc
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
From 570a9a048bb0e3a5c221ca87be9408ae35f711e2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Remi Collet <remi@remirepo.net>
|
||||||
|
Date: Mon, 8 Jan 2024 19:13:39 +0100
|
||||||
|
Subject: [PATCH] fix PKG_CONFIG_LIBDIR (#7013)
|
||||||
|
|
||||||
|
---
|
||||||
|
Magick++/bin/Magick++-config.in | 4 +++-
|
||||||
|
MagickCore/MagickCore-config.in | 4 +++-
|
||||||
|
MagickWand/MagickWand-config.in | 4 +++-
|
||||||
|
3 files changed, 9 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Magick++/bin/Magick++-config.in b/Magick++/bin/Magick++-config.in
|
||||||
|
index 877545c1a7..d55208a513 100755
|
||||||
|
--- a/Magick++/bin/Magick++-config.in
|
||||||
|
+++ b/Magick++/bin/Magick++-config.in
|
||||||
|
@@ -7,7 +7,9 @@
|
||||||
|
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig"
|
||||||
|
+libdir=@libdir@
|
||||||
|
+pkgconfigdir=@pkgconfigdir@
|
||||||
|
+export PKG_CONFIG_LIBDIR="${pkgconfigdir}"
|
||||||
|
|
||||||
|
usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
|
||||||
|
|
||||||
|
diff --git a/MagickCore/MagickCore-config.in b/MagickCore/MagickCore-config.in
|
||||||
|
index ab790055d1..2263a1dd2d 100644
|
||||||
|
--- a/MagickCore/MagickCore-config.in
|
||||||
|
+++ b/MagickCore/MagickCore-config.in
|
||||||
|
@@ -6,7 +6,9 @@
|
||||||
|
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig"
|
||||||
|
+libdir=@libdir@
|
||||||
|
+pkgconfigdir=@pkgconfigdir@
|
||||||
|
+export PKG_CONFIG_LIBDIR="${pkgconfigdir}"
|
||||||
|
|
||||||
|
usage="\
|
||||||
|
Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
|
||||||
|
diff --git a/MagickWand/MagickWand-config.in b/MagickWand/MagickWand-config.in
|
||||||
|
index 647b80c2e7..03680cfdc8 100644
|
||||||
|
--- a/MagickWand/MagickWand-config.in
|
||||||
|
+++ b/MagickWand/MagickWand-config.in
|
||||||
|
@@ -6,7 +6,9 @@
|
||||||
|
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig"
|
||||||
|
+libdir=@libdir@
|
||||||
|
+pkgconfigdir=@pkgconfigdir@
|
||||||
|
+export PKG_CONFIG_LIBDIR="${pkgconfigdir}"
|
||||||
|
|
||||||
|
usage="\
|
||||||
|
Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
|
|
@ -2,6 +2,12 @@
|
||||||
|
|
||||||
%bcond_without libheif
|
%bcond_without libheif
|
||||||
|
|
||||||
|
%if 0%{?flatpak}
|
||||||
|
%bcond_with perl
|
||||||
|
%else
|
||||||
|
%bcond_without perl
|
||||||
|
%endif
|
||||||
|
|
||||||
# Disable automatic .la file removal
|
# Disable automatic .la file removal
|
||||||
%global __brp_remove_la_files %nil
|
%global __brp_remove_la_files %nil
|
||||||
|
|
||||||
|
@ -13,8 +19,8 @@ Epoch: 1
|
||||||
%else
|
%else
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
%endif
|
%endif
|
||||||
Version: 7.1.1.11
|
Version: 7.1.1.26
|
||||||
Release: 2%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: An X application for displaying and manipulating images
|
Summary: An X application for displaying and manipulating images
|
||||||
|
|
||||||
%global VER %(foo=%{version}; echo ${foo:0:5})
|
%global VER %(foo=%{version}; echo ${foo:0:5})
|
||||||
|
@ -31,6 +37,7 @@ Source2: ImageMagick.keyring
|
||||||
# https://github.com/ImageMagick/ImageMagick/issues/6158
|
# https://github.com/ImageMagick/ImageMagick/issues/6158
|
||||||
# https://github.com/ImageMagick/ImageMagick/commit/06d3b282a43457da6b3a2d3f84c33e07064a1e98
|
# https://github.com/ImageMagick/ImageMagick/commit/06d3b282a43457da6b3a2d3f84c33e07064a1e98
|
||||||
Patch0: ImageMagick-terminate-loop-on-sentinel.patch
|
Patch0: ImageMagick-terminate-loop-on-sentinel.patch
|
||||||
|
Patch1: 570a9a048bb0e3a5c221ca87be9408ae35f711e2.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig(bzip2)
|
BuildRequires: pkgconfig(bzip2)
|
||||||
BuildRequires: pkgconfig(freetype2)
|
BuildRequires: pkgconfig(freetype2)
|
||||||
|
@ -39,8 +46,10 @@ BuildRequires: pkgconfig(libpng)
|
||||||
BuildRequires: pkgconfig(libtiff-4)
|
BuildRequires: pkgconfig(libtiff-4)
|
||||||
BuildRequires: giflib-devel
|
BuildRequires: giflib-devel
|
||||||
BuildRequires: pkgconfig(zlib)
|
BuildRequires: pkgconfig(zlib)
|
||||||
|
%if %{with perl}
|
||||||
BuildRequires: perl-devel >= 5.8.1
|
BuildRequires: perl-devel >= 5.8.1
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
|
%endif
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||||
BuildRequires: ghostscript-devel
|
BuildRequires: ghostscript-devel
|
||||||
%else
|
%else
|
||||||
|
@ -175,6 +184,7 @@ Note this documentation can also be found on the ImageMagick website:
|
||||||
http://www.imagemagick.org/
|
http://www.imagemagick.org/
|
||||||
|
|
||||||
|
|
||||||
|
%if %{with perl}
|
||||||
%package perl
|
%package perl
|
||||||
Summary: ImageMagick perl bindings
|
Summary: ImageMagick perl bindings
|
||||||
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
|
@ -186,6 +196,7 @@ Perl bindings to ImageMagick.
|
||||||
|
|
||||||
Install ImageMagick-perl if you want to use any perl scripts that use
|
Install ImageMagick-perl if you want to use any perl scripts that use
|
||||||
ImageMagick.
|
ImageMagick.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%package c++
|
%package c++
|
||||||
|
@ -238,7 +249,10 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-modules \
|
--with-modules \
|
||||||
|
%if %{with perl}
|
||||||
--with-perl \
|
--with-perl \
|
||||||
|
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
|
||||||
|
%endif
|
||||||
--with-x \
|
--with-x \
|
||||||
--with-threads \
|
--with-threads \
|
||||||
--with-magick_plus_plus \
|
--with-magick_plus_plus \
|
||||||
|
@ -250,7 +264,6 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
|
||||||
--with-openexr \
|
--with-openexr \
|
||||||
--with-rsvg \
|
--with-rsvg \
|
||||||
--with-xml \
|
--with-xml \
|
||||||
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
|
|
||||||
--with-urw-base35-font-dir="%{urw_base35_fontpath}" \
|
--with-urw-base35-font-dir="%{urw_base35_fontpath}" \
|
||||||
--without-dps \
|
--without-dps \
|
||||||
--without-gcc-arch \
|
--without-gcc-arch \
|
||||||
|
@ -286,6 +299,7 @@ cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VER}
|
||||||
# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!!
|
# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!!
|
||||||
rm %{buildroot}%{_libdir}/*.la
|
rm %{buildroot}%{_libdir}/*.la
|
||||||
|
|
||||||
|
%if %{with perl}
|
||||||
# perlmagick: fix perl path of demo files
|
# perlmagick: fix perl path of demo files
|
||||||
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
|
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
|
||||||
|
|
||||||
|
@ -306,6 +320,7 @@ if [ -z perl-pkg-files ] ; then
|
||||||
echo "ERROR: EMPTY FILE LIST"
|
echo "ERROR: EMPTY FILE LIST"
|
||||||
exit -1
|
exit -1
|
||||||
fi
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
# fix multilib issues: Rename provided file with platform-bits in name.
|
# fix multilib issues: Rename provided file with platform-bits in name.
|
||||||
# Create platform independant file inplace of provided and conditionally include required.
|
# Create platform independant file inplace of provided and conditionally include required.
|
||||||
|
@ -408,11 +423,40 @@ rm PerlMagick/demo/Generic.ttf
|
||||||
%{_libdir}/pkgconfig/Magick++-7.Q16HDRI.pc
|
%{_libdir}/pkgconfig/Magick++-7.Q16HDRI.pc
|
||||||
%{_mandir}/man1/Magick++-config.*
|
%{_mandir}/man1/Magick++-config.*
|
||||||
|
|
||||||
|
%if %{with perl}
|
||||||
%files perl -f perl-pkg-files
|
%files perl -f perl-pkg-files
|
||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.1.1.26-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.1.1.26-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.1.1.26-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 15 2024 Sérgio Basto <sergio@serjux.com> - 1:7.1.1.26-2
|
||||||
|
- fix PKG_CONFIG_LIBDIR
|
||||||
|
|
||||||
|
* Mon Jan 08 2024 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1:7.1.1.26-1
|
||||||
|
- Update to 7.1.1.26 (#2239345)
|
||||||
|
|
||||||
|
* Tue Aug 22 2023 Sérgio Basto <sergio@serjux.com> - 1:7.1.1.15-1
|
||||||
|
- Update ImageMagick to 7.1.1.15 (#2217558)
|
||||||
|
|
||||||
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.1.1.13-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jul 16 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1:7.1.1.13-1
|
||||||
|
- Update to 7.1.1.13 (#2217558)
|
||||||
|
|
||||||
|
* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1:7.1.1.11-3
|
||||||
|
- Perl 5.38 rebuild
|
||||||
|
|
||||||
* Sun Jun 18 2023 Sérgio Basto <sergio@serjux.com> - 1:7.1.1.11-2
|
* Sun Jun 18 2023 Sérgio Basto <sergio@serjux.com> - 1:7.1.1.11-2
|
||||||
- Mass rebuild for jpegxl-0.8.1
|
- Mass rebuild for jpegxl-0.8.1
|
||||||
|
|
||||||
|
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (ImageMagick-7.1.1-11.tar.xz) = b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
|
SHA512 (ImageMagick-7.1.1-26.tar.xz) = 55b93b30781b3a5d90e43caf33dd55bdc6b8e2e0ed11fcbee64ba4d2d98a73b41c9cfc7efafb7efca1bca5bcf27d98862d05ab524b09a4047a49f3d8f6a098a7
|
||||||
SHA512 (ImageMagick-7.1.1-11.tar.xz.asc) = fbdd82deedba6a1ef0dd7ba3a71454184089ab4ae0aebc8985edb18ed3aa5ddd577a0b1db9532fe5cf4df9d3d8bbbefd2ac287da87dfae5c60f848a0c5103cf7
|
SHA512 (ImageMagick-7.1.1-26.tar.xz.asc) = cc15570980a4ecd3766235b7cfbed87efebdac173bd145c1c5a2802d55b9573b1cd760d10fbd454cdcbf338e5b1f72ac15ad27587d0ee45ccf5b09219b6ae9f9
|
||||||
|
|
Loading…
Reference in New Issue