diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-04-29 11:40:51 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-03 13:32:04 +0200 |
| commit | 79d1d8d4ac4fda9fdad6a38990af7179323f295f (patch) | |
| tree | 9685d6f886ba8f7ac5413672981c0b408a43f0ef /meta-gnome/recipes-gnome/zenity | |
| parent | cfbdfd6b1da4325de3b0cf195d6f860621ee3c13 (diff) | |
| download | meta-openembedded-contrib-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.patch | 39 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb | 3 |
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 0000000000..50c9cb99f6 --- /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 89d95de4f0..17fe0eefac 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" |