Patchwork [meta-gnome,3/5] gnome-power-manager: fix configure

login
register
mail settings
Submitter Andreas Müller
Date April 29, 2013, 12:31 p.m.
Message ID <1367238685-16855-4-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/49035/
State Accepted, archived
Commit 2491bccb6d0dbfe998ef441028767661d532f34c
Headers show

Comments

Andreas Müller - April 29, 2013, 12:31 p.m.
* configure looks for libgnome-keyring (there is no option --disable-keyring)
* to have a daemon put gnome-keyring to RRECOMMENDS.

Error message was:
| Package gnome-keyring-1 was not found in the pkg-config search path.
| Perhaps you should add the directory containing `gnome-keyring-1.pc'
| to the PKG_CONFIG_PATH environment variable
| No package 'gnome-keyring-1' found
| configure:13934: $? = 1
| configure:13952: result: no
| No package 'gnome-keyring-1' found
| configure:13978: error: Package requirements (

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gnome-power-manager_2.32.0.bb                  |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

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 cc4c0c4..c11d6ea 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,9 +2,10 @@  DESCRIPTION = "Power management daemon"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "glib-2.0 gtk+ gconf gnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower"
+DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower"
+RRECOMMENDS_${PN} += "gnome-keyring"
 
 inherit gnome
 
@@ -14,7 +15,6 @@  SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda"
 SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476"
 
 EXTRA_OECONF = " --disable-scrollkeeper \
-                 --disable-keyring \
                  --disable-applets \
                  --x-includes=${STAGING_INCDIR} \
                  --x-libraries=${STAGING_LIBDIR} \