Patchwork [meta-gnome,1/5] zenity: fix build

login
register
mail settings
Submitter Andreas Müller
Date April 29, 2013, 12:31 p.m.
Message ID <1367238685-16855-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/49043/
State Accepted, archived
Commit 79d1d8d4ac4fda9fdad6a38990af7179323f295f
Headers show

Comments

Andreas Müller - April 29, 2013, 12:31 p.m.
error message was:
| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
| make[2]: *** [zenity-C.omf] Error 1

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../files/0001-Makefile.am-don-t-build-help.patch  |   39 ++++++++++++++++++++
 meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb   |    3 +-
 2 files changed, 41 insertions(+), 1 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch

Patch

diff --git a/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch b/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch
new file mode 100644
index 0000000..50c9cb9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch
@@ -0,0 +1,39 @@ 
+From 17e5606f8c4c8ff26ba18489aad4c484cf8e2949 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 29 Apr 2013 11:34:27 +0200
+Subject: [PATCH] Makefile.am: don't build help
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+it crashes with:
+
+| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
+| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
+| make[2]: *** [zenity-bg.omf] Error 1
+| make[2]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/zenity/2.32.1-r2/zenity-2.32.1/help'
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 03accc1..caec7f0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,7 @@
+ SUBDIRS = \
+ 	src	\
+ 	po	\
+-	data	\
+-	help
++	data
+ 
+ EXTRA_DIST = \
+ 	autogen.sh		\
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
index 89d95de..17fe0ee 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
@@ -2,11 +2,12 @@  DESCRIPTION = "Display dialog boxes from the commandline and shell scripts"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils"
 
 inherit gnome
+SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch"
 SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170"
 SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac"