diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /~xihh/abiword | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to '~xihh/abiword')
| -rw-r--r-- | ~xihh/abiword/PKGBUILD | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/~xihh/abiword/PKGBUILD b/~xihh/abiword/PKGBUILD index b2e9ef2ca..1da9f3a51 100644 --- a/~xihh/abiword/PKGBUILD +++ b/~xihh/abiword/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 102234 2010-12-06 22:32:25Z ibiru $ +# $Id: PKGBUILD 135772 2011-08-18 15:03:53Z andyrtr $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maël Lavault <moimael@neuf.fr> pkgbase=abiword pkgname=('abiword' 'abiword-plugins') pkgver=2.8.6 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') 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 @@ build() { 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() { 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 |