diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-07 12:36:05 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-07 12:36:05 +0100 |
commit | a56d1a610bd4032e2eae610289333ad112fc5ba1 (patch) | |
tree | 5fa9f42a339b57ef35616c01ac67c1c55c84fc7b /libre/abiword-libre | |
parent | 9437cdbc03cb103235fa0b043f4cf73882f10f34 (diff) | |
parent | 8e5a0a990a12a59cadb687cae22a1960fce1660b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/midori/PKGBUILD
community/ruby-gtk2/PKGBUILD
extra/strigi/PKGBUILD
libre/abiword-libre/PKGBUILD
libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
Diffstat (limited to 'libre/abiword-libre')
-rw-r--r-- | libre/abiword-libre/PKGBUILD | 33 | ||||
-rw-r--r-- | libre/abiword-libre/abiword-2.8.6-glib-2.31.patch | 29 |
2 files changed, 42 insertions, 20 deletions
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index f62ca7d33..ffbdc08d1 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $ +# $Id: PKGBUILD 173824 2012-12-24 15:08:34Z jgc $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maël Lavault <moimael@neuf.fr> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=2.8.6 -pkgrel=7.1 +pkgrel=8 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' 'ttf-liberation') +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' + 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv' 'ttf-liberation') options=('!makeflags' '!libtool') -source=("http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz" - 'compat_libwpg_0_9.patch' - 'abiword-2.8.6-no-undefined.patch' - 'abiword-2.8.6-libpng15.patch' - 'liberation-fonts.patch' - 'abiword-2.8.6-glib-2.31.patch') +source=(http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz + compat_libwpg_0_9.patch + abiword-2.8.6-no-undefined.patch + abiword-2.8.6-libpng15.patch + abiword-2.8.6-glib-2.31.patch + liberation-fonts.patch) md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' '09446a2ebba8288fc611e88f7cf17298' '42e2614b6e0aad457d91f6ce20b6f225' '40e370e7e88c5437140ef18037abfbd3' - '880b17db6f249d977d2a7cd012d9ce02' - 'a467caab414ec3eb72fc5d3b05f07eb8') + '6ec338a27a6fb590c348724ddb545849' + '880b17db6f249d977d2a7cd012d9ce02') build() { cd "${srcdir}/${_pkgbase}-${pkgver}" @@ -34,6 +34,11 @@ build() { # fix a gcc 4.6.x build issue, patch from Fedora patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" + + # Fix build with recent glib, patch from Gentoo + patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch" + + # Replace non-free fonts support to liberation fonts patch -Np1 -i "${srcdir}/liberation-fonts.patch" patch -Np1 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch" @@ -57,7 +62,7 @@ build() { package_abiword-libre() { pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts" - depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') + depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils') install=$pkgname.install optdepends=('abiword-libre-plugins') conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword') diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch index c43c4d05c..8b938cc25 100644 --- a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch +++ b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch @@ -1,6 +1,22 @@ -diff -Nur abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h abiword-2.8.6/src/af/util/xp/ut_go_file.h ---- abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h 2009-08-27 08:27:10.000000000 -0500 -+++ abiword-2.8.6/src/af/util/xp/ut_go_file.h 2012-09-22 03:36:55.774542745 -0500 +------------------------------------------------------------------------ +r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines +Changed paths: + M /abiword/trunk/src/af/util/xp/ut_go_file.h + +Bug 13197: only import glib.h +Patch by Dominique Leuenberger. +------------------------------------------------------------------------ +r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines +Changed paths: + M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h + +Bug 13247 - Fix glib headers. Patch by Funda Wang +(safe to backport) +------------------------------------------------------------------------ +Index: src/af/util/xp/ut_go_file.h +=================================================================== +--- src/af/util/xp/ut_go_file.h (revision 30478) ++++ src/af/util/xp/ut_go_file.h (revision 30479) @@ -31,7 +31,6 @@ #include <glib.h> @@ -9,9 +25,10 @@ diff -Nur abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h abiword-2.8.6/src/af/ut #include <time.h> G_BEGIN_DECLS -diff -Nur abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h ---- abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h 2007-01-16 18:17:27.000000000 -0500 -+++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h 2012-09-22 03:35:46.741217566 -0500 +Index: goffice-bits/goffice/app/goffice-app.h +=================================================================== +--- goffice-bits/goffice/app/goffice-app.h (revision 30601) ++++ goffice-bits/goffice/app/goffice-app.h (revision 30602) @@ -22,7 +22,7 @@ #ifndef GOFFICE_APP_H #define GOFFICE_APP_H |