[arch-commits] Commit in abiword/trunk (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Aug 13 09:02:35 UTC 2011
Date: Saturday, August 13, 2011 @ 05:02:34
Author: andyrtr
Revision: 135371
upgpkg: abiword 2.8.6-5
gnutls rebuild; add build fix; add install scriptlet for mimetype handling; add a miissing dep to the plugins
Added:
abiword/trunk/abiword-2.8.6-no-undefined.patch
abiword/trunk/abiword.install
Modified:
abiword/trunk/PKGBUILD
----------------------------------+
PKGBUILD | 15 ++++++++++-----
abiword-2.8.6-no-undefined.patch | 21 +++++++++++++++++++++
abiword.install | 11 +++++++++++
3 files changed, 42 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-13 08:50:09 UTC (rev 135370)
+++ PKGBUILD 2011-08-13 09:02:34 UTC (rev 135371)
@@ -5,21 +5,25 @@
pkgbase=abiword
pkgname=('abiword' 'abiword-plugins')
pkgver=2.8.6
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.abisource.com"
makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
options=('!makeflags' '!libtool')
source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz"
- compat_libwpg_0_9.patch)
+ compat_libwpg_0_9.patch
+ abiword-2.8.6-no-undefined.patch)
sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
- 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea')
+ 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea'
+ '159b1cd0b9354868ab86f851b64a03dae7d254dc')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
+ # fix a gcc 4.6.x build issue, patch from Fedora
+ patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
libtoolize --force
autoreconf
@@ -29,7 +33,8 @@
package_abiword() {
pkgdesc="A fully-featured word processor"
- depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant')
+ depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
+ install=$pkgname.install
optdepends=('abiword-plugins')
conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
@@ -49,7 +54,7 @@
package_abiword-plugins() {
pkgdesc="Additional plugins for Abiword"
- depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots')
+ depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
Added: abiword-2.8.6-no-undefined.patch
===================================================================
--- abiword-2.8.6-no-undefined.patch (rev 0)
+++ abiword-2.8.6-no-undefined.patch 2011-08-13 09:02:34 UTC (rev 135371)
@@ -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
+
Added: abiword.install
===================================================================
--- abiword.install (rev 0)
+++ abiword.install 2011-08-13 09:02:34 UTC (rev 135371)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
More information about the arch-commits
mailing list