2009-12-04 Brian Cameron <
[email protected]>
* base-specs/gnome-power-manager.spec,
patches/gnome-power-manager-10-no-console-kit.diff: Remove
patch since ConsoleKit is integrating into build 130.
--- a/ChangeLog Sat Dec 05 02:25:15 2009 +0000
+++ b/ChangeLog Sat Dec 05 03:48:38 2009 +0000
@@ -1,5 +1,10 @@
2009-12-04 Brian Cameron <[email protected]>
+ * base-specs/gnome-power-manager.spec,
+ patches/gnome-power-manager-10-no-console-kit.diff: Remove
+ patch since ConsoleKit is integrating into build 130.
+
+2009-12-04 Brian Cameron <[email protected]>
* base-specs/gdm.spec, patches/gdm-18-timed.diff: Add patch to fix
bugzilla bug #603697.
--- a/base-specs/gnome-power-manager.spec Sat Dec 05 02:25:15 2009 +0000
+++ b/base-specs/gnome-power-manager.spec Sat Dec 05 03:48:38 2009 +0000
@@ -44,16 +44,14 @@
Patch8: gnome-power-manager-08-cpufreq.diff
# date:2008-09-11 owner:jedy type:branding
Patch9: gnome-power-manager-09-menu-entry.diff
-# date:2009-03-02 owner:jedy type:branding
-Patch10: gnome-power-manager-10-no-console-kit.diff
# date:2009-03-24 owner:jedy type:branding
-Patch11: gnome-power-manager-11-no-dpms-sync.diff
+Patch10: gnome-power-manager-10-no-dpms-sync.diff
# date:2009-04-22 owner:jedy type:branding
-Patch12: gnome-power-manager-12-autorestart.diff
+Patch11: gnome-power-manager-11-autorestart.diff
# date:2009-05-05 owner:jedy type:branding
-Patch13: gnome-power-manager-13-no-profile.diff
+Patch12: gnome-power-manager-12-no-profile.diff
# date:2009-09-10 doo:10224 owner:jedy type:bug
-Patch14: gnome-power-manager-14-help.diff
+Patch13: gnome-power-manager-13-help.diff
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: dbus-glib-devel >= 0.73
@@ -124,7 +122,6 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%patch14 -p1
%build
%ifos linux
@@ -192,6 +189,9 @@
%changelog
+* Fri Dec 04 2009 - [email protected]
+- Remove patch gnome-power-manager-10-no-console-kit.diff since
+ ConsoleKit is integrating into build 130.
* Thu Sep 10 2009 - [email protected]
- Add 14-help.diff.
* Wed May 20 2009 - [email protected]
--- a/patches/gnome-power-manager-10-no-console-kit.diff Sat Dec 05 02:25:15 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- gnome-power-manager-2.24.4/src/egg-console-kit.c 2008-11-17 18:03:36.000000000 +0800
-+++ gnome-power-manager-2.24.4-new/src/egg-console-kit.c 2009-03-02 17:08:15.218805233 +0800
-@@ -70,11 +70,11 @@ G_DEFINE_TYPE (EggConsoleKit, egg_consol
- gboolean
- egg_console_kit_is_local (EggConsoleKit *console)
- {
-- gboolean ret = FALSE;
-- gboolean value = FALSE;
-+ gboolean ret = TRUE;
-+ gboolean value = TRUE;
- GError *error = NULL;
-
-- g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE);
-+ g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), TRUE);
-
- /* maybe console kit does not know about our session */
- if (console->priv->proxy_session == NULL) {
-@@ -105,11 +105,11 @@ out:
- gboolean
- egg_console_kit_is_active (EggConsoleKit *console)
- {
-- gboolean ret = FALSE;
-- gboolean value = FALSE;
-+ gboolean ret = TRUE;
-+ gboolean value = TRUE;
- GError *error = NULL;
-
-- g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE);
-+ g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), TRUE);
-
- /* maybe console kit does not know about our session */
- if (console->priv->proxy_session == NULL) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-power-manager-10-no-dpms-sync.diff Sat Dec 05 03:48:38 2009 +0000
@@ -0,0 +1,20 @@
+diff -uprN gnome-power-manager-2.24.4-orig/src/gpm-dpms.c gnome-power-manager-2.24.4/src/gpm-dpms.c
+--- gnome-power-manager-2.24.4-orig/src/gpm-dpms.c 2009-03-19 14:37:38.856619450 +0800
++++ gnome-power-manager-2.24.4/src/gpm-dpms.c 2009-03-19 14:39:35.232623388 +0800
+@@ -343,6 +343,7 @@ static gboolean
+ sync_settings (GpmDpms *dpms,
+ GError **error)
+ {
++#if 0
+ guint standby;
+ guint suspend;
+ guint off;
+@@ -378,6 +379,8 @@ sync_settings (GpmDpms *dpms,
+ suspend,
+ off,
+ error);
++#endif
++ return TRUE;
+ }
+
+ gboolean
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-power-manager-11-autorestart.diff Sat Dec 05 03:48:38 2009 +0000
@@ -0,0 +1,7 @@
+--- gnome-power-manager-2.24.4/data/gnome-power-manager.desktop.in.orig 2009-04-22 16:15:07.025188065 +0800
++++ gnome-power-manager-2.24.4/data/gnome-power-manager.desktop.in 2009-04-22 16:15:15.312355348 +0800
+@@ -13,3 +13,4 @@ X-GNOME-Bugzilla-Product=gnome-power-man
+ X-GNOME-Bugzilla-Component=gnome-power-manager
+ X-GNOME-Bugzilla-Version=2.24.4
+ X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
++X-GNOME-AutoRestart=true
--- a/patches/gnome-power-manager-11-no-dpms-sync.diff Sat Dec 05 02:25:15 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff -uprN gnome-power-manager-2.24.4-orig/src/gpm-dpms.c gnome-power-manager-2.24.4/src/gpm-dpms.c
---- gnome-power-manager-2.24.4-orig/src/gpm-dpms.c 2009-03-19 14:37:38.856619450 +0800
-+++ gnome-power-manager-2.24.4/src/gpm-dpms.c 2009-03-19 14:39:35.232623388 +0800
-@@ -343,6 +343,7 @@ static gboolean
- sync_settings (GpmDpms *dpms,
- GError **error)
- {
-+#if 0
- guint standby;
- guint suspend;
- guint off;
-@@ -378,6 +379,8 @@ sync_settings (GpmDpms *dpms,
- suspend,
- off,
- error);
-+#endif
-+ return TRUE;
- }
-
- gboolean
--- a/patches/gnome-power-manager-12-autorestart.diff Sat Dec 05 02:25:15 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
---- gnome-power-manager-2.24.4/data/gnome-power-manager.desktop.in.orig 2009-04-22 16:15:07.025188065 +0800
-+++ gnome-power-manager-2.24.4/data/gnome-power-manager.desktop.in 2009-04-22 16:15:15.312355348 +0800
-@@ -13,3 +13,4 @@ X-GNOME-Bugzilla-Product=gnome-power-man
- X-GNOME-Bugzilla-Component=gnome-power-manager
- X-GNOME-Bugzilla-Version=2.24.4
- X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
-+X-GNOME-AutoRestart=true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-power-manager-12-no-profile.diff Sat Dec 05 03:48:38 2009 +0000
@@ -0,0 +1,11 @@
+--- gnome-power-manager-2.24.4-orig/src/gpm-profile.h 2009-05-05 11:57:32.751152059 +0800
++++ gnome-power-manager-2.24.4/src/gpm-profile.h 2009-05-05 12:17:23.919643732 +0800
+@@ -34,7 +34,7 @@ G_BEGIN_DECLS
+ #define GPM_IS_PROFILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPM_TYPE_PROFILE))
+ #define GPM_PROFILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPM_TYPE_PROFILE, GpmProfileClass))
+
+-#define GPM_PROFILE_GOOD_TRUST 40
++#define GPM_PROFILE_GOOD_TRUST 0
+
+ typedef struct GpmProfilePrivate GpmProfilePrivate;
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-power-manager-13-help.diff Sat Dec 05 03:48:38 2009 +0000
@@ -0,0 +1,25 @@
+diff -uprN gnome-power-manager-2.24.4-old/applets/brightness/brightness-applet.c gnome-power-manager-2.24.4/applets/brightness/brightness-applet.c
+--- gnome-power-manager-2.24.4-old/applets/brightness/brightness-applet.c 2009-09-10 15:18:48.272826177 +0800
++++ gnome-power-manager-2.24.4/applets/brightness/brightness-applet.c 2009-09-10 15:24:28.366558818 +0800
+@@ -30,7 +30,6 @@
+ #include <panel-applet.h>
+ #include <gtk/gtk.h>
+ #include <gtk/gtkbox.h>
+-#include <libgnomeui/gnome-help.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <libdbus-watch.h>
+ #include <glib-object.h>
+@@ -796,11 +795,9 @@ gpm_applet_help_cb (BonoboUIComponent *u
+ {
+ GError *error = NULL;
+ GpmBrightnessApplet *applet = GPM_BRIGHTNESS_APPLET(data);
+- GnomeProgram *program = gnome_program_get ();
+
+- gnome_help_display_with_doc_id (program, "gnome-power-manager",
+- "gnome-power-manager.xml",
+- "applets-brightness", &error);
++ gtk_show_uri(NULL, "ghelp:gnome-power-manager?applets-brightness",
++ GDK_CURRENT_TIME, &error);
+ if (error != NULL) {
+ GtkWidget *dialog =
+ gtk_message_dialog_new (GTK_WINDOW (GTK_WIDGET(applet)->parent),
--- a/patches/gnome-power-manager-13-no-profile.diff Sat Dec 05 02:25:15 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-power-manager-2.24.4-orig/src/gpm-profile.h 2009-05-05 11:57:32.751152059 +0800
-+++ gnome-power-manager-2.24.4/src/gpm-profile.h 2009-05-05 12:17:23.919643732 +0800
-@@ -34,7 +34,7 @@ G_BEGIN_DECLS
- #define GPM_IS_PROFILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPM_TYPE_PROFILE))
- #define GPM_PROFILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPM_TYPE_PROFILE, GpmProfileClass))
-
--#define GPM_PROFILE_GOOD_TRUST 40
-+#define GPM_PROFILE_GOOD_TRUST 0
-
- typedef struct GpmProfilePrivate GpmProfilePrivate;
-
--- a/patches/gnome-power-manager-14-help.diff Sat Dec 05 02:25:15 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -uprN gnome-power-manager-2.24.4-old/applets/brightness/brightness-applet.c gnome-power-manager-2.24.4/applets/brightness/brightness-applet.c
---- gnome-power-manager-2.24.4-old/applets/brightness/brightness-applet.c 2009-09-10 15:18:48.272826177 +0800
-+++ gnome-power-manager-2.24.4/applets/brightness/brightness-applet.c 2009-09-10 15:24:28.366558818 +0800
-@@ -30,7 +30,6 @@
- #include <panel-applet.h>
- #include <gtk/gtk.h>
- #include <gtk/gtkbox.h>
--#include <libgnomeui/gnome-help.h>
- #include <gdk/gdkkeysyms.h>
- #include <libdbus-watch.h>
- #include <glib-object.h>
-@@ -796,11 +795,9 @@ gpm_applet_help_cb (BonoboUIComponent *u
- {
- GError *error = NULL;
- GpmBrightnessApplet *applet = GPM_BRIGHTNESS_APPLET(data);
-- GnomeProgram *program = gnome_program_get ();
-
-- gnome_help_display_with_doc_id (program, "gnome-power-manager",
-- "gnome-power-manager.xml",
-- "applets-brightness", &error);
-+ gtk_show_uri(NULL, "ghelp:gnome-power-manager?applets-brightness",
-+ GDK_CURRENT_TIME, &error);
- if (error != NULL) {
- GtkWidget *dialog =
- gtk_message_dialog_new (GTK_WINDOW (GTK_WIDGET(applet)->parent),