summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome-power-manager
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-power-manager')
-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/sysrooted-pkg-config.patch35
-rw-r--r--meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb54
3 files changed, 0 insertions, 126 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
deleted file mode 100644
index d6d49bbda6..0000000000
--- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch
+++ /dev/null
@@ -1,37 +0,0 @@
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/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch
deleted file mode 100644
index f3db7ab6e2..0000000000
--- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1In cross environment we have to prepend the sysroot to the path found by
2pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
3it ends up using the files from host system. Now usually people have gnome installed
4so the build succeeds but if you dont have gnome installed on build host then
5it wont find the files on host system and packages using gnome-doc-utils wont
6compile.
7
8This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
9will be empty
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Index: gnome-power-manager-2.32.0/gnome-doc-utils.make
16===================================================================
17--- gnome-power-manager-2.32.0.orig/gnome-doc-utils.make 2010-01-27 08:28:31.000000000 -0800
18+++ gnome-power-manager-2.32.0/gnome-doc-utils.make 2011-09-25 16:16:04.914813800 -0700
19@@ -124,11 +124,11 @@
20
21 _xml2po ?= `which xml2po`
22
23-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
24-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
25-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
26-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
27-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
28+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
29+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
30+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
31+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
32+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
33
34 if ENABLE_SK
35 _ENABLE_SK = true
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
deleted file mode 100644
index ec2110785d..0000000000
--- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb
+++ /dev/null
@@ -1,54 +0,0 @@
1SUMMARY = "Power management daemon"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4
5PR = "r4"
6
7DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower gnome-doc-utils"
8RRECOMMENDS_${PN} += "gnome-keyring"
9
10inherit gnome
11
12SRC_URI += " \
13 file://sysrooted-pkg-config.patch \
14 file://0001-Makefile.am-don-t-build-help-man.patch \
15"
16
17SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda"
18SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476"
19GNOME_COMPRESS_TYPE="bz2"
20
21EXTRA_OECONF = " --disable-scrollkeeper \
22 --disable-applets \
23 --x-includes=${STAGING_INCDIR} \
24 --x-libraries=${STAGING_LIBDIR} \
25 --enable-compile-warnings=no \
26 ac_cv_header_X11_extensions_dpms_h=yes \
27"
28
29do_configure_append() {
30 # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
31 for i in $(find ${B} -name "Makefile") ; do
32 sed -i -e s:-Werror::g $i
33 done
34 sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${B}/src/Makefile
35}
36
37PACKAGES =+ "${PN}-applets"
38
39FILES_${PN}-applets = "${bindir}/*applet* \
40 ${libdir}/bonobo/servers \
41 ${datadir}/gnome-2.0/ui \
42"
43
44FILES_${PN} += "${datadir}/icons \
45 ${datadir}/dbus-1 \
46 ${datadir}/gnome/autostart \
47"
48
49FILES_${PN}-doc += "${datadir}/omf \
50 ${datadir}/gnome/help \
51"
52
53# gnome-power-manager-2.32.0/src/gpm-manager.c:488:18: error: too many arguments to function 'notify_notification_new'
54PNBLACKLIST[gnome-power-manager] ?= "BROKEN: not compatible with current libnotify - the recipe will be removed on 2017-09-01 unless the issue is fixed"