From 0b095f9fe2ee5aad3158e1e979ad13f442f9f4c3 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 8 Feb 2012 20:27:01 +0000
Subject: main/abiword: rebuild against libwv-1.2.9

---
 main/abiword/APKBUILD                         | 19 ++++++++++++++-----
 main/abiword/abiword-2.8.6-no-undefined.patch | 21 +++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 main/abiword/abiword-2.8.6-no-undefined.patch

(limited to 'main/abiword')

diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD
index 7385b64e7..f1b39f64e 100644
--- a/main/abiword/APKBUILD
+++ b/main/abiword/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abiword
 pkgver=2.8.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A fully-featured word processor"
 url="http://www.abisource.com"
 arch="all"
 license="GPL"
 makedepends="pkgconfig libglade-dev libgsf-dev enchant-dev fribidi-dev wv-dev
-	popt-dev jpeg-dev librsvg-dev bzip2-dev goffice-dev"
+	popt-dev jpeg-dev librsvg-dev bzip2-dev goffice-dev
+	autoconf automake libtool"
 	
 # openxml plugin
 makedepends="$makedepends boost-dev"
@@ -28,11 +29,18 @@ for _i in $_plugins; do
 done
 
 source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz
-	abiword-png15.patch"
+	abiword-png15.patch
+	abiword-2.8.6-no-undefined.patch
+	"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < "$srcdir"/abiword-png15.patch
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	autoreconf --force --install
 }
 
 build() {
@@ -75,4 +83,5 @@ plugins() {
 }
 
 md5sums="f883b0a7f26229a9c66fd6a1a94381aa  abiword-2.8.6.tar.gz
-1d0bb11ed10b431ab312173de81d12c4  abiword-png15.patch"
+1d0bb11ed10b431ab312173de81d12c4  abiword-png15.patch
+42e2614b6e0aad457d91f6ce20b6f225  abiword-2.8.6-no-undefined.patch"
diff --git a/main/abiword/abiword-2.8.6-no-undefined.patch b/main/abiword/abiword-2.8.6-no-undefined.patch
new file mode 100644
index 000000000..c07000edb
--- /dev/null
+++ b/main/abiword/abiword-2.8.6-no-undefined.patch
@@ -0,0 +1,21 @@
+diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
+--- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
++++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
+@@ -107,7 +107,7 @@
+ 
+ AbiWord_LDFLAGS = \
+ 	$(DEPS_LIBS) \
+-	--no-undefined \
++	-Wl,--no-undefined \
+ 	-avoid-version \
+ 	-export-dynamic \
+ 	-headerpad_max_install_names 
+@@ -129,7 +129,7 @@
+ 
+ abiword_LDFLAGS = \
+ 	$(platform_ldflags) \
+-	--no-undefined      \
++	-Wl,--no-undefined      \
+ 	-avoid-version      \
+ 	-export-dynamic
+ 
-- 
cgit v1.2.3