[arch-commits] Commit in libtiff4/trunk (PKGBUILD libtiff4-soname.patch)

[Maxime Gauduin]

    Date: Saturday, April 6, 2019 @ 20:08:53
  Author: alucryd
Revision: 450039

upgpkg: libtiff4 3.9.7-4

Added:
  libtiff4/trunk/libtiff4-soname.patch
Modified:
  libtiff4/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   23 ++++++++++++++---------
 libtiff4-soname.patch |   15 +++++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-06 20:08:17 UTC (rev 450038)
+++ PKGBUILD	2019-04-06 20:08:53 UTC (rev 450039)
@@ -3,22 +3,32 @@
 
 pkgname=libtiff4
 pkgver=3.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc='Library for manipulation of TIFF images'
 arch=(x86_64)
 url=http://www.simplesystems.org/libtiff/
 license=(custom)
 depends=(
+  gcc-libs
   libjpeg-turbo
   zlib
 )
 makedepends=(git)
-source=(git+https://gitlab.com/libtiff/libtiff.git#tag=Release-v${pkgver//./-})
-sha256sums=(SKIP)
+source=(
+  git+https://gitlab.com/libtiff/libtiff.git#tag=Release-v${pkgver//./-}
+  libtiff4-soname.patch
+)
+sha256sums=(
+  SKIP
+  e6246631f6d943715b612b4ddd2279c946ff90c9e8d755fa639e8051a6eb3488
+)
 
 prepare() {
   cd libtiff
 
+  # Rename 3.9.7 to 4.3.7, 3.6.x was the first release with the unintentional ABI change
+  patch -Np1 -i ../libtiff4-soname.patch
+
   ./autogen.sh
 }
 
@@ -32,12 +42,7 @@
 
 package() {
   make DESTDIR="${pkgdir}" -C libtiff install
-  rm -rf "${pkgdir}"/usr/{bin,include,lib/libtiff{,xx}.{a,so,so.3},share}
-  # Rename 3.9.7 to 4.3.7, 3.6.x was the first release with the unintentional ABI change
-  mv "${pkgdir}"/usr/lib/libtiff.so.{3.9.7,4.3.7}
-  mv "${pkgdir}"/usr/lib/libtiffxx.so.{3.9.7,4.3.7}
-  ln -s libtiff.so.4.3.7 "${pkgdir}"/usr/lib/libtiff.so.4
-  ln -s libtiffxx.so.4.3.7 "${pkgdir}"/usr/lib/libtiffxx.so.4
+  rm -rf "${pkgdir}"/usr/{bin,include,lib/libtiff{,xx}.{a,so},share}
   install -Dm 644 libtiff/COPYRIGHT -t "${pkgdir}"/usr/share/licenses/libtiff4/
 }
 

Added: libtiff4-soname.patch
===================================================================
--- libtiff4-soname.patch	                        (rev 0)
+++ libtiff4-soname.patch	2019-04-06 20:08:53 UTC (rev 450039)
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index e7cf8041..fb869708 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,8 +39,8 @@ AM_MAINTAINER_MODE
+ 
+ dnl Versioning.
+ dnl Don't fill the ALPHA_VERSION field, if not applicable.
+-LIBTIFF_MAJOR_VERSION=3
+-LIBTIFF_MINOR_VERSION=9
++LIBTIFF_MAJOR_VERSION=4
++LIBTIFF_MINOR_VERSION=3
+ LIBTIFF_MICRO_VERSION=7
+ LIBTIFF_ALPHA_VERSION=
+ LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION