abiword: fix build with glib-2.32

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2012-04-30 15:29:52 +02:00
parent 0c78b561ef
commit 8457644a41
2 changed files with 24 additions and 2 deletions
@@ -0,0 +1,21 @@
--- abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h 2012-04-30 15:06:28.000000000 +0200
+++ abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h 2007-01-17 00:17:27.000000000 +0100
@@ -22,7 +22,7 @@
#ifndef GOFFICE_APP_H
#define GOFFICE_APP_H
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
--- abiword-2.8.6/src/af/util/xp/ut_go_file.h 2012-04-30 15:08:43.000000000 +0200
+++ abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h 2009-08-27 15:27:10.000000000 +0200
@@ -31,7 +31,6 @@
#include <glib.h>
#include <gsf/gsf.h>
-#include <glib/gerror.h>
#include <time.h>
G_BEGIN_DECLS
@@ -2,12 +2,13 @@ require abiword-2.5.inc
DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
RCONFLICTS_${PN} = "abiword-embedded"
PR = "r2"
PR = "r3"
SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
file://autogen-common.sh \
file://nodolt.patch \
file://fix.no.undefined.param.patch"
file://fix.no.undefined.param.patch \
file://abiword.fix.glib-2.32.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"