Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
imagemagick
Commits:
1eab238b by Antonio Rojas at 2024-04-10T00:52:34+02:00
upgpkg: 7.1.1.30-1: Update to 7.1.1.30
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix-wmf-detection.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = imagemagick
pkgdesc = An image viewing/manipulation program
- pkgver = 7.1.1.29
- pkgrel = 2
+ pkgver = 7.1.1.30
+ pkgrel = 1
url = https://www.imagemagick.org/
arch = x86_64
license = custom
@@ -77,12 +77,14 @@ pkgbase = imagemagick
backup = etc/ImageMagick-7/type.xml
backup = etc/ImageMagick-7/type-dejavu.xml
backup = etc/ImageMagick-7/type-ghostscript.xml
- source = https://imagemagick.org/archive/ImageMagick-7.1.1-29.tar.xz
- source = https://imagemagick.org/archive/ImageMagick-7.1.1-29.tar.xz.asc
+ source = https://imagemagick.org/archive/ImageMagick-7.1.1-30.tar.xz
+ source = https://imagemagick.org/archive/ImageMagick-7.1.1-30.tar.xz.asc
source = arch-fonts.diff
+ source = fix-wmf-detection.patch
validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
- sha256sums =
f140465fbeb0b4724cba4394bc6f6fb32715731c1c62572d586f4f1c8b9b0685
+ sha256sums =
ec192780d09da7d7b1e7a374a19f97d69cceb4e5e83057515cd595eda233a891
sha256sums = SKIP
sha256sums =
a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
+ sha256sums =
9d96075030f303d5bab107921e172166b8ffad53cb55913decb4e35fc956213c
pkgname = imagemagick
=====================================
PKGBUILD
=====================================
@@ -2,8 +2,8 @@
# Contributor: Eric Bélanger <[email protected]>
pkgname=imagemagick
-pkgver=7.1.1.29
-pkgrel=2
+pkgver=7.1.1.30
+pkgrel=1
_relname=ImageMagick-${pkgver%%.*}
_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
pkgdesc='An image viewing/manipulation program'
@@ -69,10 +69,12 @@ checkdepends=(gsfonts
ttf-dejavu)
replaces=(imagemagick-doc)
source=(https://imagemagick.org/archive/$_tarname.tar.xz{,.asc}
- arch-fonts.diff)
-sha256sums=('f140465fbeb0b4724cba4394bc6f6fb32715731c1c62572d586f4f1c8b9b0685'
+ arch-fonts.diff
+ fix-wmf-detection.patch)
+sha256sums=('ec192780d09da7d7b1e7a374a19f97d69cceb4e5e83057515cd595eda233a891'
'SKIP'
- 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+ 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
+ '9d96075030f303d5bab107921e172166b8ffad53cb55913decb4e35fc956213c')
validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae
shopt -s extglob
@@ -84,6 +86,11 @@ prepare() {
# Fix up typemaps to match our packages, where possible
patch -p1 -i ../arch-fonts.diff
+
+ # Fix WMF detection, https://github.com/ImageMagick/ImageMagick/issues/7230
+ patch -p1 -i ../fix-wmf-detection.patch
+
+ autoreconf -vif
}
build() {
@@ -109,7 +116,7 @@ build() {
--with-openexr \
--with-openjp2 \
--with-perl \
- --with-perl-options=INSTALLDIRS=vendor \
+ --with-perl-options='INSTALLDIRS=vendor
INSTALLVENDORMAN3DIR=/usr/share/man/man3' \
--with-rsvg \
--with-webp \
--with-wmf \
=====================================
fix-wmf-detection.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 9fa9b868b..24018b755 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2898,7 +2898,7 @@ if test "$with_uhdr" != 'no'; then
+ AC_LANG_PUSH([C++])
+ AC_CHECK_HEADER([ultrahdr_api.h],[passed=`expr $passed +
1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([uhdr],[uhdr_create_decoder],[passed=`expr $passed +
1`],[failed=`expr $failed + 1`],[])
+-
++ AC_LANG_POP
+ AC_MSG_CHECKING([if google ultrahdr package is complete])
+
+ if test $passed -gt 0; then
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/imagemagick/-/commit/1eab238be6c8928a793a126ac525650bceca6b4b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/imagemagick/-/commit/1eab238be6c8928a793a126ac525650bceca6b4b
You're receiving this email because of your account on gitlab.archlinux.org.
