[arch-commits] Commit in libtiger/trunk (0001-Fix-automake.patch PKGBUILD)

[Jelle van der Waa]

    Date: Wednesday, June 21, 2017 @ 12:02:25
  Author: jelle
Revision: 299123

Fix building of libtiger

Added:
  libtiger/trunk/0001-Fix-automake.patch
Modified:
  libtiger/trunk/PKGBUILD

-------------------------+
 0001-Fix-automake.patch |   49 ++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                |   12 ++++++++---
 2 files changed, 58 insertions(+), 3 deletions(-)

Added: 0001-Fix-automake.patch
===================================================================
--- 0001-Fix-automake.patch	                        (rev 0)
+++ 0001-Fix-automake.patch	2017-06-21 12:02:25 UTC (rev 299123)
@@ -0,0 +1,49 @@
+From b1f7c2dafaab5ed57d28ad241ffc93d55043e849 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <j.vanderwaa at kopano.com>
+Date: Wed, 21 Jun 2017 13:57:18 +0200
+Subject: [PATCH] Fix automake
+
+---
+ Makefile.am     | 2 --
+ configure.ac    | 1 +
+ doc/Makefile.am | 2 --
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c5d6b6e..644a1a9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,8 +11,6 @@ tigerinc_HEADERS=include/tiger/tiger.h include/tiger/tiger_config.h
+ tigerpc_DATA=misc/pkgconfig/tiger.pc
+ noinst_DATA=misc/pkgconfig/tiger-uninstalled.pc
+ 
+-LIBTOOLFLAGS=--silent
+-
+ AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
+ 
+ lib_libtiger_la_SOURCES=\
+diff --git a/configure.ac b/configure.ac
+index 2f63684..ae5f971 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,7 @@ dnl     then set AGE to 0.
+ 
+ LIBTIGER_SHARED_VERSION="5:2:0"
+ 
++AM_PROG_AR
+ AC_PROG_CC_C_O
+ AC_PROG_LIBTOOL
+ AC_PROG_GREP
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 70d48c5..d5aff38 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,5 +1,3 @@
+-LIBTOOLFLAGS=--silent
+-
+ # dependency to get doc to be built
+ noinst_DATA = .doc-dummy-target
+ 
+-- 
+2.13.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-21 11:58:56 UTC (rev 299122)
+++ PKGBUILD	2017-06-21 12:02:25 UTC (rev 299123)
@@ -11,12 +11,19 @@
 arch=('i686' 'x86_64')
 depends=('pango' 'libkate')
 makedepends=('pkg-config' 'git')
-source=("$pkgname::git+git://git.xiph.org/users/oggk/tiger.git#tag=tiger-${pkgver}")
+source=("$pkgname::git+git://git.xiph.org/users/oggk/tiger.git#tag=tiger-${pkgver}"
+        "0001-Fix-automake.patch")
+md5sums=('SKIP'
+         '1e7306e6b26e6915308b9a01c6dfda9c')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}"
+  patch -Np1 -i "${srcdir}/0001-Fix-automake.patch"
   ./autogen.sh
+}
 
+build() {
+  cd "${srcdir}/${pkgname}"
   ./configure --prefix=/usr \
               --enable-static=no \
               --disable-doc
@@ -29,4 +36,3 @@
 
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('SKIP')