* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/, gnome-extra/gnome-power-manager/files/
@ 2011-02-22 19:44 Nirbheek Chauhan
0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan @ 2011-02-22 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 1455a37a74fc564f41a1dec26b2d9e32e56d354a
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 15:29:53 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 15:30:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1455a37a
gnome-extra/gnome-power-manager: 2.91.5 -> 2.91.90
* Reorder src_prepare so that eautoreconf is avoided
---
...-power-manager-2.91.5-fix-schemas-migrate.patch | 41 --------------------
...1.ebuild => gnome-power-manager-2.91.90.ebuild} | 27 +++----------
...5-r1.ebuild => gnome-power-manager-9999.ebuild} | 27 +++----------
3 files changed, 14 insertions(+), 81 deletions(-)
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.91.5-fix-schemas-migrate.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.91.5-fix-schemas-migrate.patch
deleted file mode 100644
index 5d2baf9..0000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.91.5-fix-schemas-migrate.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 40f32d9a78c334605ee5ff0dced2c85b0e837f5c Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Wed, 19 Jan 2011 20:44:58 +0530
-Subject: [PATCH] gschema.migrate: button keys moved to gnome-settings-daemon, fix typo
-
-* hibernate/power/suspend button keys moved to gnome-settings-daemon,
- fix the migration schema to point there
-* Fix typo in brightness-ac schema key
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639956
----
- data/org.gnome.power-manager.gschema.migrate | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/data/org.gnome.power-manager.gschema.migrate b/data/org.gnome.power-manager.gschema.migrate
-index d767fe5..c562857 100644
---- a/data/org.gnome.power-manager.gschema.migrate
-+++ b/data/org.gnome.power-manager.gschema.migrate
-@@ -2,10 +2,7 @@
- backlight-enable = /apps/gnome-power-manager/backlight/enable
- backlight-battery-reduce = /apps/gnome-power-manager/backlight/battery_reduce
- brightness-dim-battery = /apps/gnome-power-manager/backlight/brightness_dim_battery
--brightness-ac" = /apps/gnome-power-manager/backlight/brightness_ac
--button-suspend = /apps/gnome-power-manager/buttons/suspend
--button-hibernate = /apps/gnome-power-manager/buttons/hibernate
--button-power = /apps/gnome-power-manager/buttons/power
-+brightness-ac = /apps/gnome-power-manager/backlight/brightness_ac
- use-time-for-policy = /apps/gnome-power-manager/general/use_time_for_policy
- lock-use-screensaver = /apps/gnome-power-manager/lock/use_screensaver_settings
- lock-blank-screen = /apps/gnome-power-manager/lock/blank_screen
-@@ -37,3 +34,7 @@ time-action = /apps/gnome-power-manager/thresholds/time_action
- enable-sound = /apps/gnome-power-manager/ui/enable_sound
- show-actions = /apps/gnome-power-manager/ui/show_actions
- icon-policy = /apps/gnome-power-manager/ui/icon_policy
-+[org.gnome.settings-daemon.plugins.power]
-+button-suspend = /apps/gnome-power-manager/buttons/suspend
-+button-hibernate = /apps/gnome-power-manager/buttons/hibernate
-+button-power = /apps/gnome-power-manager/buttons/power
---
-1.7.3.4
-
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.90.ebuild
similarity index 78%
copy from gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
copy to gnome-extra/gnome-power-manager/gnome-power-manager-2.91.90.ebuild
index d88579b..35a5704 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.5 2010/12/12 16:53:55 armin76 Exp $
@@ -62,20 +62,21 @@ DEPEND="${COMMON_DEPEND}
# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
src_prepare() {
+ gnome2_src_prepare
+
G2CONF="${G2CONF}
$(use_enable test tests)
$(use_enable doc docbook-docs)
+ --disable-strict
--enable-compile-warnings=minimum
--disable-schemas-compile"
DOCS="AUTHORS ChangeLog NEWS README TODO"
- # Should get merged soonish, remove from live version after that
- # https://bugzilla.gnome.org/show_bug.cgi?id=639956
- epatch "${FILESDIR}/${P}-fix-schemas-migrate.patch"
-
# Drop debugger CFLAGS from configure
+ # XXX: touch configure.ac only if running eautoreconf, otherwise
+ # maintainer mode gets triggered -- even if the order is correct
sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
- -i configure.ac configure || die "debugger sed failed"
+ -i configure || die "debugger sed failed"
if ! use doc; then
# Remove the docbook2man rules here since it's not handled by a proper
@@ -84,20 +85,6 @@ src_prepare() {
-i man/Makefile.am man/Makefile.in \
|| die "docbook sed failed"
fi
-
- # glibc splits this out, whereas other libc's do not tend to
- if use elibc_glibc; then
- sed -e 's/-lresolv//' \
- -i configure.ac configure || die "resolv sed failed"
- fi
-
- if [[ ${PV} != 9999 ]]; then
- # FIXME: This is required to prevent maintainer mode after "debugger sed"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- fi
-
- gnome2_src_prepare
}
src_test() {
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
similarity index 78%
rename from gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
rename to gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
index d88579b..35a5704 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.5 2010/12/12 16:53:55 armin76 Exp $
@@ -62,20 +62,21 @@ DEPEND="${COMMON_DEPEND}
# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
src_prepare() {
+ gnome2_src_prepare
+
G2CONF="${G2CONF}
$(use_enable test tests)
$(use_enable doc docbook-docs)
+ --disable-strict
--enable-compile-warnings=minimum
--disable-schemas-compile"
DOCS="AUTHORS ChangeLog NEWS README TODO"
- # Should get merged soonish, remove from live version after that
- # https://bugzilla.gnome.org/show_bug.cgi?id=639956
- epatch "${FILESDIR}/${P}-fix-schemas-migrate.patch"
-
# Drop debugger CFLAGS from configure
+ # XXX: touch configure.ac only if running eautoreconf, otherwise
+ # maintainer mode gets triggered -- even if the order is correct
sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
- -i configure.ac configure || die "debugger sed failed"
+ -i configure || die "debugger sed failed"
if ! use doc; then
# Remove the docbook2man rules here since it's not handled by a proper
@@ -84,20 +85,6 @@ src_prepare() {
-i man/Makefile.am man/Makefile.in \
|| die "docbook sed failed"
fi
-
- # glibc splits this out, whereas other libc's do not tend to
- if use elibc_glibc; then
- sed -e 's/-lresolv//' \
- -i configure.ac configure || die "resolv sed failed"
- fi
-
- if [[ ${PV} != 9999 ]]; then
- # FIXME: This is required to prevent maintainer mode after "debugger sed"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- fi
-
- gnome2_src_prepare
}
src_test() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/, gnome-extra/gnome-power-manager/files/
@ 2011-06-27 20:25 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-06-27 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 5caed8b4756d30febef79f817a2f6d249dfbd8d5
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Jun 27 20:16:53 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Jun 27 20:22:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5caed8b4
gnome-extra/gnome-power-manager: fix auto-suspend and screensaver bugs
Revision bump with fixes from upstream git for auto-suspend failing to
work (Redhat bug #679083) and inability to query gnome-screensaver's
settings (Gnome bug #650464).
---
.../gnome-power-manager-3.0.2-idle-status.patch | 31 ++++
.../gnome-power-manager-3.0.2-screensaver.patch | 146 ++++++++++++++++++++
....ebuild => gnome-power-manager-3.0.2-r1.ebuild} | 10 ++-
3 files changed, 186 insertions(+), 1 deletions(-)
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
new file mode 100644
index 0000000..acd9093
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
@@ -0,0 +1,31 @@
+From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 02 May 2011 23:18:58 +0000
+Subject: gpm-idle: manually update the status property
+
+gnome-session doesn't emit PropertyChanged since it uses dbus-glib,
+therefore we need to manually update the cached property when
+receiving a SessionChanged signal.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=679083
+
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/gpm-idle.c b/src/gpm-idle.c
+index 04225fc..0f2f1ee 100644
+--- a/src/gpm-idle.c
++++ b/src/gpm-idle.c
+@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha
+ return;
+ }
+ if (g_strcmp0 (signal_name, "StatusChanged") == 0) {
++ guint status;
++
++ g_variant_get (parameters, "(u)", &status);
++ g_dbus_proxy_set_cached_property (proxy, "status",
++ g_variant_new ("u", status));
+ g_debug ("Received gnome session status change");
+ gpm_idle_evaluate (idle);
+ return;
+--
+cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
new file mode 100644
index 0000000..1ff7cc6
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
@@ -0,0 +1,146 @@
+From c36c35b2ecd818e54de975fe81885eca05a1be98 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@gmail.com>
+Date: Wed, 08 Jun 2011 16:01:33 +0000
+Subject: Query gnome-screensaver settings with GSettings
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650464
+---
+diff --git a/configure.ac b/configure.ac
+index 90bbe5f..3134ae4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
+
+ PKG_CHECK_MODULES(GNOME, [
+ gtk+-3.0 >= 2.91.0
+- gconf-2.0 >= 2.31.1
+ gnome-keyring-1 >= 0.6.0
+ cairo >= 1.0.0])
+
+diff --git a/src/gpm-common.h b/src/gpm-common.h
+index b540c05..dabda1a 100644
+--- a/src/gpm-common.h
++++ b/src/gpm-common.h
+@@ -129,8 +129,8 @@ G_BEGIN_DECLS
+ #define GPM_SETTINGS_INFO_LAST_DEVICE "info-last-device"
+
+ /* gnome-screensaver */
+-#define GS_CONF_DIR "/apps/gnome-screensaver"
+-#define GS_CONF_PREF_LOCK_ENABLED GS_CONF_DIR "/lock_enabled"
++#define GS_SETTINGS_SCHEMA "org.gnome.desktop.screensaver"
++#define GS_SETTINGS_PREF_LOCK_ENABLED "lock-enabled"
+
+ typedef enum {
+ GPM_ICON_POLICY_PRESENT,
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index 0fc864d..902db44 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -38,7 +38,6 @@
+
+ #include <glib/gi18n.h>
+ #include <gnome-keyring.h>
+-#include <gconf/gconf-client.h>
+ #include <libupower-glib/upower.h>
+
+ #include "egg-console-kit.h"
+@@ -51,8 +50,8 @@
+
+ struct GpmControlPrivate
+ {
+- GConfClient *conf;
+ GSettings *settings;
++ GSettings *settings_ss;
+ UpClient *client;
+ };
+
+@@ -118,7 +117,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
+ See bug #331164 for all the juicy details. :-) */
+ use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
+ if (use_ss_setting) {
+- do_lock = gconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
++ do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
+ g_debug ("Using ScreenSaver settings (%i)", do_lock);
+ } else {
+ do_lock = g_settings_get_boolean (control->priv->settings, policy);
+@@ -256,8 +255,8 @@ gpm_control_finalize (GObject *object)
+ g_return_if_fail (GPM_IS_CONTROL (object));
+ control = GPM_CONTROL (object);
+
+- g_object_unref (control->priv->conf);
+ g_object_unref (control->priv->settings);
++ g_object_unref (control->priv->settings_ss);
+ g_object_unref (control->priv->client);
+
+ g_return_if_fail (control->priv != NULL);
+@@ -306,7 +305,7 @@ gpm_control_init (GpmControl *control)
+
+ control->priv->client = up_client_new ();
+ control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+- control->priv->conf = gconf_client_get_default ();
++ control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
+ }
+
+ /**
+diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
+index 842ea7c..f41baed 100644
+--- a/src/gpm-screensaver.c
++++ b/src/gpm-screensaver.c
+@@ -25,7 +25,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+-#include <gconf/gconf-client.h>
+
+ #include "gpm-screensaver.h"
+ #include "gpm-common.h"
+@@ -41,7 +40,7 @@ static void gpm_screensaver_finalize (GObject *object);
+ struct GpmScreensaverPrivate
+ {
+ GDBusProxy *proxy;
+- GConfClient *conf;
++ GSettings *settings;
+ };
+
+ enum {
+@@ -63,7 +62,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver)
+ {
+ gboolean enabled;
+ g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
+- enabled = gconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
++ enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED);
+ return enabled;
+ }
+
+@@ -296,7 +295,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
+ g_warning ("failed to setup screensaver proxy: %s", error->message);
+ g_error_free (error);
+ }
+- screensaver->priv->conf = gconf_client_get_default ();
++ screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA) ;
+ }
+
+ /**
+@@ -313,7 +312,7 @@ gpm_screensaver_finalize (GObject *object)
+ screensaver = GPM_SCREENSAVER (object);
+ screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
+
+- g_object_unref (screensaver->priv->conf);
++ g_object_unref (screensaver->priv->settings);
+ g_object_unref (screensaver->priv->proxy);
+
+ G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object);
+diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
+index e7eb21b..a444c2e 100644
+--- a/src/gpm-statistics.c
++++ b/src/gpm-statistics.c
+@@ -27,7 +27,6 @@
+ #include <glib/gi18n.h>
+
+ #include <gtk/gtk.h>
+-#include <gconf/gconf-client.h>
+ #include <libupower-glib/upower.h>
+
+ #include "gpm-array-float.h"
+--
+cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
similarity index 89%
rename from gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2.ebuild
rename to gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
index 0860e52..25829e6 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
@@ -5,7 +5,7 @@
EAPI="3"
GCONF_DEBUG="no"
-inherit gnome2 virtualx
+inherit eutils gnome2 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -80,6 +80,14 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
+ # https://bugzilla.redhat.com/show_bug.cgi?id=679083
+ # will be in next release
+ epatch "${FILESDIR}/${P}-idle-status.patch"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=650464
+ # will be in next release
+ epatch "${FILESDIR}/${P}-screensaver.patch"
+
# Drop debugger CFLAGS from configure
# XXX: touch configure.ac only if running eautoreconf, otherwise
# maintainer mode gets triggered -- even if the order is correct
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-27 20:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 19:44 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/, gnome-extra/gnome-power-manager/files/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2011-06-27 20:25 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox