[arch-commits] Commit in abiword/trunk (PKGBUILD abiword-2.8.6-glib-2.31.patch)

[Jan de Groot]

    Date: Monday, December 24, 2012 @ 10:08:34
  Author: jgc
Revision: 173824

upgpkg: abiword 2.8.6-8

Adjust dependency on goffice, fix compilation

Added:
  abiword/trunk/abiword-2.8.6-glib-2.31.patch
Modified:
  abiword/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   23 ++++++++++++++---------
 abiword-2.8.6-glib-2.31.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-24 11:15:35 UTC (rev 173823)
+++ PKGBUILD	2012-12-24 15:08:34 UTC (rev 173824)
@@ -5,21 +5,23 @@
 pkgbase=abiword
 pkgname=('abiword' 'abiword-plugins')
 pkgver=2.8.6
-pkgrel=7
+pkgrel=8
 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')
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
+             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv')
 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')
+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)
 md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
          '09446a2ebba8288fc611e88f7cf17298'
          '42e2614b6e0aad457d91f6ce20b6f225'
-         '40e370e7e88c5437140ef18037abfbd3')
+         '40e370e7e88c5437140ef18037abfbd3'
+         '6ec338a27a6fb590c348724ddb545849')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -29,6 +31,9 @@
   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"
+
   libtoolize --force
   autoreconf
 
@@ -49,7 +54,7 @@
 
 package_abiword() {
   pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
+  depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils')
   install=$pkgname.install
   optdepends=('abiword-plugins')
   conflicts=("abiword-plugins<${pkgver}-${pkgrel}")

Added: abiword-2.8.6-glib-2.31.patch
===================================================================
--- abiword-2.8.6-glib-2.31.patch	                        (rev 0)
+++ abiword-2.8.6-glib-2.31.patch	2012-12-24 15:08:34 UTC (rev 173824)
@@ -0,0 +1,40 @@
+------------------------------------------------------------------------
+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>
+ #include <gsf/gsf.h>
+-#include <glib/gerror.h>
+ #include <time.h>
+ 
+ G_BEGIN_DECLS
+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
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+