Patchwork [meta-oe,PATCHv2,09/11] glade3: disable help, fails to build

login
register
mail settings
Submitter Martin Jansa
Date Dec. 14, 2012, 8:36 a.m.
Message ID <7210880fb3baf98739bf61f9ab55764d6e76f423.1355474146.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40977/
State Accepted
Commit 7210880fb3baf98739bf61f9ab55764d6e76f423
Headers show

Comments

Martin Jansa - Dec. 14, 2012, 8:36 a.m.
* fixes:
| http://www.oasis-open.org/docbook/xml/4.1.2/ent/iso-grk1.ent:1: validity error : All markup of the conditional section is not in the same entity
| HTTP/1.1 200 OK
|    ^
| http://www.oasis-open.org/docbook/xml/4.1.2/ent/iso-grk1.ent:1: parser error : Content error in the external subset
| HTTP/1.1 200 OK
|       ^
| unable to parse sl/glade3.xml
| make[2]: *** [glade3-sl.omf] Error 1
| make[2]: *** Waiting for unfinished jobs....
| make[2]: Leaving directory `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/glade3/3.8.2-r0/glade3-3.8.2/help'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
index 8cd6a0e..733b8ed 100644
--- a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
+++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
@@ -5,6 +5,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "gtk+ gnome-doc-utils-native"
 
+PR = "r1"
+
 inherit autotools pkgconfig pythonnative
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
@@ -14,6 +16,10 @@  SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+do_configure_prepend() {
+	sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am
+}
+
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
 FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"