Date: Thursday, January 13, 2022 @ 21:54:04 Author: dvzrv Revision: 1102969
upgpkg: php-imagick 3.7.0-1: Upgrade to 3.7.0. Remove now included patch. Simplify quoting in file. Modified: php-imagick/trunk/PKGBUILD Deleted: php-imagick/trunk/5cf94f5e119026325081f4e0253769d010e216e7.patch ------------------------------------------------+ 5cf94f5e119026325081f4e0253769d010e216e7.patch | 37 ----------------- PKGBUILD | 50 +++++++++-------------- 2 files changed, 21 insertions(+), 66 deletions(-) Deleted: 5cf94f5e119026325081f4e0253769d010e216e7.patch =================================================================== --- 5cf94f5e119026325081f4e0253769d010e216e7.patch 2022-01-13 21:49:04 UTC (rev 1102968) +++ 5cf94f5e119026325081f4e0253769d010e216e7.patch 2022-01-13 21:54:04 UTC (rev 1102969) @@ -1,37 +0,0 @@ -From 5cf94f5e119026325081f4e0253769d010e216e7 Mon Sep 17 00:00:00 2001 -From: Remi Collet <r...@remirepo.net> -Date: Mon, 20 Sep 2021 13:44:02 +0200 -Subject: [PATCH] Fix #457 ensure format is always lowercase - ---- - imagick.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/imagick.c b/imagick.c -index ac889118..ee725669 100644 ---- a/imagick.c -+++ b/imagick.c -@@ -3388,6 +3388,7 @@ static zval *php_imagick_read_property(zend_object *object, zend_string *member, - if (format) { - retval = rv; - ZVAL_STRING(retval, format); -+ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); - IMAGICK_FREE_MAGICK_MEMORY(format); - } else { - retval = rv; -@@ -3460,6 +3461,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, voi - if (format) { - retval = rv; - ZVAL_STRING(retval, format); -+ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); - IMAGICK_FREE_MAGICK_MEMORY(format); - } else { - retval = rv; -@@ -3542,6 +3544,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, con - - if (format) { - ZVAL_STRING(retval, format, 1); -+ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); - IMAGICK_FREE_MAGICK_MEMORY(format); - } else { - ZVAL_STRING(retval, "", 1); Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-13 21:49:04 UTC (rev 1102968) +++ PKGBUILD 2022-01-13 21:54:04 UTC (rev 1102969) @@ -3,23 +3,23 @@ _name=imagick pkgbase=php-imagick pkgname=('php-imagick' 'php7-imagick') -pkgver=3.5.1 -pkgrel=2 +pkgver=3.7.0 +pkgrel=1 pkgdesc="PHP extension to create and modify images using the ImageMagick library" -arch=('x86_64') +arch=(x86_64) url="https://github.com/imagick/imagick" -license=('PHP') -depends=('imagemagick' 'ttf-font') -makedepends=('librsvg' 'php' 'php7') -checkdepends=('ttf-dejavu') -source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/${_name}/${_name}/archive/refs/tags/${pkgver}.tar.gz" - "${_name}.ini" '5cf94f5e119026325081f4e0253769d010e216e7.patch') -sha512sums=('8ef4b4a253deb80909c34ae87ba7783a295e93c5033f95ecae56e6ebf7ef7be8deb8e1bfecfa9f3dcb9ba26ee95ef49a0d69418af96fd7cd01d5316f63bdc2cd' - '1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc' - '9350db2849b0f32b25a0f427b86415df51dd31de3fc2d71516b322bd53e925e8ac8ef8d7d283874490c912665d5189ed5528721d9164c095ef801e7e737e2b3b') -b2sums=('d2ad6d3e1568d5769d2b3ba8f77af2e7d82b04bb65535b9901846602b8dcee3954a8451ffd5c2c86590f35dc209eb9301e8ea75a28ddf7c989cf41a104f04656' - '291d68f50a2c173b857c0f132e1874f0682da3c7176f67b946a19a68256ab19f56a234bafa16711c3f8ef26c4bc7df04ea8afdecbcb984820b9bf3fd2a135edb' - 'c91160b4305864aacfc72fc72b307e8bc9b0c26ceaacf0deda94371047477a802356abb47656548d47824c1024e35ef58c168d1e2bcb39514b218fd5fe1e7ce5') +license=(PHP) +depends=(imagemagick ttf-font) +makedepends=(librsvg php php7) +checkdepends=(ttf-dejavu) +source=( + "${pkgbase}-${pkgver}.tar.gz::https://github.com/${_name}/${_name}/archive/refs/tags/${pkgver}.tar.gz" + "${_name}.ini" +) +sha512sums=('67cf7e76ee59dcf2fbb6230956344033022ea2b93f82fcdb949998638ce9990004948fddf13e7f4649b2115ce6f402a1eb4f95aa36a3b6a26f3f016b0e958bc3' + '1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc') +b2sums=('3f8b94ca0619edee15de9aaf21ad3bf2896a072223b1eed70bfc8e47ef36fa766f370e801ae6b4300840a76e71d926b36cdbe7459df75804362ab4079eb2f56c' + '291d68f50a2c173b857c0f132e1874f0682da3c7176f67b946a19a68256ab19f56a234bafa16711c3f8ef26c4bc7df04ea8afdecbcb984820b9bf3fd2a135edb') prepare() { mv -v "${_name}-${pkgver}" "${pkgbase}-${pkgver}" @@ -27,9 +27,6 @@ sed -e "s/@PACKAGE_VERSION@/${pkgver}/" \ -i "${pkgbase}-${pkgver}/php_imagick.h" "${pkgbase}-${pkgver}/package.xml" - # Fix build with latest ImageMagick: https://github.com/Imagick/imagick/issues/457 - patch -d "${pkgbase}-${pkgver}" -p1 -i "${srcdir}/5cf94f5e119026325081f4e0253769d010e216e7.patch" - cp -av "${pkgbase}-${pkgver}" "${pkgname[1]}-${pkgver}" ( cd "$pkgname-${pkgver}" @@ -68,28 +65,23 @@ } package_php-imagick() { - depends+=('php') + depends+=(php) backup=("etc/php/conf.d/${_name}.ini") cd "${pkgname}-${pkgver}" make INSTALL_ROOT="$pkgdir/" install - ls -lah .. install -vDm 644 "../${_name}.ini" -t "${pkgdir}/etc/php/conf.d/" - install -vDm 644 {ChangeLog,CREDITS,README.md} \ - -t "${pkgdir}/usr/share/doc/${pkgname}/" - install -vDm 644 examples/*.php \ - -t "${pkgdir}/usr/share/doc/${pkgname}/examples" + install -vDm 644 {ChangeLog,CREDITS,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}/" + install -vDm 644 examples/*.php -t "${pkgdir}/usr/share/doc/${pkgname}/examples" } package_php7-imagick() { - depends+=('php7') + depends+=(php7) backup=("etc/php7/conf.d/${_name}.ini") cd "${pkgname}-${pkgver}" make INSTALL_ROOT="$pkgdir/" install install -vDm 644 "../${_name}.ini" -t "${pkgdir}/etc/php7/conf.d/" - install -vDm 644 {ChangeLog,CREDITS,README.md} \ - -t "${pkgdir}/usr/share/doc/${pkgname}/" - install -vDm 644 examples/*.php \ - -t "${pkgdir}/usr/share/doc/${pkgname}/examples" + install -vDm 644 {ChangeLog,CREDITS,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}/" + install -vDm 644 examples/*.php -t "${pkgdir}/usr/share/doc/${pkgname}/examples" }