summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch37
-rw-r--r--meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb11
2 files changed, 42 insertions, 6 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch
new file mode 100644
index 000000000..d6d49bbda
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch
@@ -0,0 +1,37 @@
1From 3ed15a3c6ae4ab94c7e3af306644bb5d7f3fd1fa Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 29 Apr 2013 13:08:10 +0200
4Subject: [PATCH] Makefile.am: don't build help/man
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9help crashes with:
10
11| 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; }
12| unable to parse fr/gnome-power-manager.xml
13
14Upstream-Status: Inappropriate [configuration]
15
16Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
17---
18 Makefile.am | 2 --
19 1 files changed, 0 insertions(+), 2 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 005b8a0..5b9e318 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -5,9 +5,7 @@ SUBDIRS = \
26 src \
27 po \
28 docs \
29- man \
30 data \
31- help \
32 policy \
33 tools
34
35--
361.7.6.5
37
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 c11d6ea69..aac6b6c9c 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"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5PR = "r3" 5PR = "r4"
6 6
7DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower" 7DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower"
8RRECOMMENDS_${PN} += "gnome-keyring" 8RRECOMMENDS_${PN} += "gnome-keyring"
9 9
10inherit gnome 10inherit gnome
11 11
12SRC_URI += "file://sysrooted-pkg-config.patch" 12SRC_URI += " \
13 file://sysrooted-pkg-config.patch \
14 file://0001-Makefile.am-don-t-build-help-man.patch \
15"
13 16
14SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" 17SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda"
15SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" 18SRC_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
26do_configure_prepend() {
27 sed -i -e 's: man ::g' ${S}/Makefile.am
28}
29
30do_configure_append() { 29do_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