[multilib-testing] -> [multilib] 'lib32-libtiff-4.4.0-3' move

lib32-libtiff/x86_64/multilib-testing/PKGBUILD

@@ -1,78 +0,0 @@
-# Maintainer: Nathan Owens <ndowens@artixlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-_pkgname=libtiff
-pkgname=lib32-${_pkgname}
-pkgver=4.4.0
-pkgrel=3
-pkgdesc='Library for manipulation of TIFF images (32-bit)'
-url='http://www.simplesystems.org/libtiff/'
-arch=('x86_64')
-license=('custom')
-depends=('libtiff' 'lib32-glibc' 'lib32-gcc-libs' 'lib32-libjpeg-turbo' 'lib32-zlib' 'lib32-xz' 'lib32-zstd')
-provides=('libtiff.so' 'libtiffxx.so')
-options=(debug)
-source=(
-  https://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz{,.sig}
-  # fix CVE-2022-2056 / CVE-2022-2057 / CVE-2022-2058: https://bugs.archlinux.org/task/75360
-  $pkgname-4.4.0-fpe_tiffcrop.patch::https://gitlab.com/libtiff/libtiff/-/commit/dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch
-)
-sha512sums=('78ffab7667d0feb8d38571bc482390fc6dd20b93a798ab3a8b5cc7d5ab00b44a37f67eb8f19421e4ab33ad89ab40e382128f8a4bbdf097e0efb6d9fca5ac6f9e'
-            'SKIP'
-            '5e36f443bbbfdd1270cb1f4d3ce4b0b415d658fe7e14764b315db73606ea28e854661cda74f1c5ccb00a2247431b966b9ac5271a1e3204837f79cb6fc50bf5bf')
-b2sums=('1480aca5f9b3d4509229fb6c1b967bdeb2053c4100f21d486d9f4a375742249aa7f54d6b5ab27679075499c226a011bc65988e22c064b3986d89f2cf5b0200dc'
-        'SKIP'
-        '2dc47541b05e6c674c3fa3f7109528d7001a494af937fc57f1862ce75dc467dd4acd6892de1bd017d182b1dcbb80242cffa27f0f3ebde3ed57ee13df5b733821')
-validpgpkeys=(
-  'EBDFDB21B020EE8FD151A88DE301047DE1198975' # Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-  'B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D' # Even Rouault <even.rouault@spatialys.com>
-)
-
-prepare() {
-  cd tiff-${pkgver}
-  # apply patch from the source array (should be a pacman feature)
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    patch -Np1 < "../$src"
-  done
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd tiff-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-ld-version-script \
-    --mandir=/usr/share/man \
-    --with-docdir=/usr/share/doc/${pkgname} \
-    --libdir=/usr/lib32 \
-    --includedir=/usr/include/libtiff32
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd tiff-${pkgver}
-  make check
-}
-
-package() {
-  depends+=('libjpeg.so')
-  cd tiff-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{share,bin}
-  mkdir -p "${pkgdir}/usr/share/licenses"
-  ln -s ${_pkgname} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-# vim: ts=2 sw=2 et:

lib32-libtiff/x86_64/multilib/PKGBUILD

@@ -1,21 +1,29 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Nathan Owens <ndowens@artixlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 _pkgname=libtiff
 pkgname=lib32-${_pkgname}
 pkgver=4.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc='Library for manipulation of TIFF images (32-bit)'
 url='http://www.simplesystems.org/libtiff/'
 arch=('x86_64')
 license=('custom')
-depends=('libtiff' 'lib32-glibc' 'lib32-gcc-libs' 'lib32-libjpeg' 'lib32-zlib' 'lib32-xz' 'lib32-zstd')
-source=(https://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz{,.sig})
+depends=('libtiff' 'lib32-glibc' 'lib32-gcc-libs' 'lib32-libjpeg-turbo' 'lib32-zlib' 'lib32-xz' 'lib32-zstd')
+provides=('libtiff.so' 'libtiffxx.so')
+options=(debug)
+source=(
+  https://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz{,.sig}
+  # fix CVE-2022-2056 / CVE-2022-2057 / CVE-2022-2058: https://bugs.archlinux.org/task/75360
+  $pkgname-4.4.0-fpe_tiffcrop.patch::https://gitlab.com/libtiff/libtiff/-/commit/dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch
+)
 sha512sums=('78ffab7667d0feb8d38571bc482390fc6dd20b93a798ab3a8b5cc7d5ab00b44a37f67eb8f19421e4ab33ad89ab40e382128f8a4bbdf097e0efb6d9fca5ac6f9e'
-            'SKIP')
+            'SKIP'
+            '5e36f443bbbfdd1270cb1f4d3ce4b0b415d658fe7e14764b315db73606ea28e854661cda74f1c5ccb00a2247431b966b9ac5271a1e3204837f79cb6fc50bf5bf')
 b2sums=('1480aca5f9b3d4509229fb6c1b967bdeb2053c4100f21d486d9f4a375742249aa7f54d6b5ab27679075499c226a011bc65988e22c064b3986d89f2cf5b0200dc'
-        'SKIP')
+        'SKIP'
+        '2dc47541b05e6c674c3fa3f7109528d7001a494af937fc57f1862ce75dc467dd4acd6892de1bd017d182b1dcbb80242cffa27f0f3ebde3ed57ee13df5b733821')
 validpgpkeys=(
   'EBDFDB21B020EE8FD151A88DE301047DE1198975' # Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
   'B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D' # Even Rouault <even.rouault@spatialys.com>
@@ -43,6 +51,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --enable-ld-version-script \
     --mandir=/usr/share/man \
     --with-docdir=/usr/share/doc/${pkgname} \
     --libdir=/usr/lib32 \