diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-04-29 13:14:29 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-03 13:32:04 +0200 |
| commit | 376a5b381f597dd87eb20d685b0f0f26f6347135 (patch) | |
| tree | 709a23c7047b8d29f2bd9e3cef7a7b03da082c5b /meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb | |
| parent | 2491bccb6d0dbfe998ef441028767661d532f34c (diff) | |
| download | meta-openembedded-376a5b381f597dd87eb20d685b0f0f26f6347135.tar.gz | |
gnome-power-manager: fix compile
* on some machines help crashed with:
| xsltproc -o gnome-power-manager-C.omf --stringparam db2omf.basename gnome-power-manager --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.3//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnome-power-manager/2.32.0-r2/gnome-power-manager-2.32.0/help/gnome-power-manager.omf.in" /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/gnome-power-manager.xml || { rm -f "gnome-power-manager-C.omf"; exit 1; }
| unable to parse fr/gnome-power-manager.xml
* disable man in recipe did not work
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/gnome-power-manager/gnome-power-manager_2.32.0.bb')
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb index c11d6ea69b..aac6b6c9ce 100644 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb | |||
| @@ -2,14 +2,17 @@ DESCRIPTION = "Power management daemon" | |||
| 2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 4 | 4 | ||
| 5 | PR = "r3" | 5 | PR = "r4" |
| 6 | 6 | ||
| 7 | DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower" | 7 | DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower" |
| 8 | RRECOMMENDS_${PN} += "gnome-keyring" | 8 | RRECOMMENDS_${PN} += "gnome-keyring" |
| 9 | 9 | ||
| 10 | inherit gnome | 10 | inherit gnome |
| 11 | 11 | ||
| 12 | SRC_URI += "file://sysrooted-pkg-config.patch" | 12 | SRC_URI += " \ |
| 13 | file://sysrooted-pkg-config.patch \ | ||
| 14 | file://0001-Makefile.am-don-t-build-help-man.patch \ | ||
| 15 | " | ||
| 13 | 16 | ||
| 14 | SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" | 17 | SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" |
| 15 | SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" | 18 | SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" |
| @@ -23,10 +26,6 @@ EXTRA_OECONF = " --disable-scrollkeeper \ | |||
| 23 | ac_cv_header_X11_extensions_dpms_h=yes \ | 26 | ac_cv_header_X11_extensions_dpms_h=yes \ |
| 24 | " | 27 | " |
| 25 | 28 | ||
| 26 | do_configure_prepend() { | ||
| 27 | sed -i -e 's: man ::g' ${S}/Makefile.am | ||
| 28 | } | ||
| 29 | |||
| 30 | do_configure_append() { | 29 | do_configure_append() { |
| 31 | rm config.log | 30 | rm config.log |
| 32 | # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror | 31 | # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror |
