summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/zenity
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-04-29 11:40:51 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-03 13:32:04 +0200
commit79d1d8d4ac4fda9fdad6a38990af7179323f295f (patch)
tree9685d6f886ba8f7ac5413672981c0b408a43f0ef /meta-gnome/recipes-gnome/zenity
parentcfbdfd6b1da4325de3b0cf195d6f860621ee3c13 (diff)
downloadmeta-openembedded-79d1d8d4ac4fda9fdad6a38990af7179323f295f.tar.gz
zenity: fix build
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> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/zenity')
-rw-r--r--meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch39
-rw-r--r--meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb3
2 files changed, 41 insertions, 1 deletions
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 000000000..50c9cb99f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch
@@ -0,0 +1,39 @@
1From 17e5606f8c4c8ff26ba18489aad4c484cf8e2949 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 29 Apr 2013 11:34:27 +0200
4Subject: [PATCH] Makefile.am: don't build help
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9it crashes with:
10
11| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
12| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
13| make[2]: *** [zenity-bg.omf] Error 1
14| 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'
15
16Upstream-Status: Inappropriate [configuration]
17
18Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
19---
20 Makefile.am | 3 +--
21 1 files changed, 1 insertions(+), 2 deletions(-)
22
23diff --git a/Makefile.am b/Makefile.am
24index 03accc1..caec7f0 100644
25--- a/Makefile.am
26+++ b/Makefile.am
27@@ -1,8 +1,7 @@
28 SUBDIRS = \
29 src \
30 po \
31- data \
32- help
33+ data
34
35 EXTRA_DIST = \
36 autogen.sh \
37--
381.7.6.5
39
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 89d95de4f..17fe0eefa 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"
2LICENSE = "LGPLv2" 2LICENSE = "LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r1" 5PR = "r2"
6 6
7DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" 7DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils"
8 8
9inherit gnome 9inherit gnome
10SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch"
10SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" 11SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170"
11SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" 12SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac"
12 13