diff options
Diffstat (limited to 'sysutils/gnome-power-manager/files')
10 files changed, 92 insertions, 115 deletions
diff --git a/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in b/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in new file mode 100644 index 000000000000..9a5d2c5a5417 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in @@ -0,0 +1,10 @@ +--- applets/brightness/Makefile.in.orig 2010-01-01 20:51:42.000000000 +0800 ++++ applets/brightness/Makefile.in 2010-01-01 20:51:42.000000000 +0800 +@@ -344,6 +344,7 @@ + gnome_brightness_applet_LDADD = \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) \ ++ -lexecinfo \ + $(PANEL_LIBS) + + serverdir = $(prefix)/libdata/bonobo/servers diff --git a/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in b/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in new file mode 100644 index 000000000000..4965221fe0e9 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in @@ -0,0 +1,10 @@ +--- applets/inhibit/Makefile.in.orig 2010-01-01 20:53:23.000000000 +0800 ++++ applets/inhibit/Makefile.in 2010-01-01 20:53:36.000000000 +0800 +@@ -343,6 +343,7 @@ + gnome_inhibit_applet_LDADD = \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) \ ++ -lexecinfo \ + $(PANEL_LIBS) + + serverdir = $(prefix)/libdata/bonobo/servers diff --git a/sysutils/gnome-power-manager/files/patch-configure b/sysutils/gnome-power-manager/files/patch-configure new file mode 100644 index 000000000000..69d50145e201 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-configure @@ -0,0 +1,25 @@ +--- configure.orig 2010-01-30 18:17:55.000000000 -0500 ++++ configure 2010-01-30 18:18:23.000000000 -0500 +@@ -12822,21 +12822,15 @@ if test "$GCC" = "yes"; then + WARNINGFLAGS="$WARNINGFLAGS -Wreturn-type" + WARNINGFLAGS="$WARNINGFLAGS -Wformat-nonliteral" + WARNINGFLAGS="$WARNINGFLAGS -Wformat-security" +- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-include-dirs" + WARNINGFLAGS="$WARNINGFLAGS -Wmissing-format-attribute" +- WARNINGFLAGS="$WARNINGFLAGS -Wclobbered" +- WARNINGFLAGS="$WARNINGFLAGS -Wempty-body" +- WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers" + # WARNINGFLAGS="$WARNINGFLAGS -Wsign-compare" +- WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits" + # WARNINGFLAGS="$WARNINGFLAGS -Wuninitialized" + # WARNINGFLAGS="$WARNINGFLAGS -Waggregate-return" + WARNINGFLAGS="$WARNINGFLAGS -Wdeclaration-after-statement" + WARNINGFLAGS="$WARNINGFLAGS -Wshadow" + WARNINGFLAGS="$WARNINGFLAGS -Winline" + # WARNINGFLAGS="$WARNINGFLAGS -Wswitch-enum" +- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type" +- WARNINGFLAGS="$WARNINGFLAGS -Woverride-init" ++# WARNINGFLAGS="$WARNINGFLAGS -Woverride-init" + WARNINGFLAGS="$WARNINGFLAGS -Wno-strict-aliasing" + else + WARNINGFLAGS="" diff --git a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c b/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c deleted file mode 100644 index 6d98cece2825..000000000000 --- a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libhal-glib/libhal-gdevice.c.orig 2009-04-19 02:15:52.000000000 -0400 -+++ libhal-glib/libhal-gdevice.c 2009-04-19 02:16:09.000000000 -0400 -@@ -280,7 +280,7 @@ hal_gdevice_query_capability (HalGDevice - return FALSE; - } - ret = dbus_g_proxy_call (proxy, "QueryCapability", error, -- G_TYPE_STRING, device->priv->udi, -+ G_TYPE_STRING, capability, - G_TYPE_INVALID, - G_TYPE_BOOLEAN, has_capability, - G_TYPE_INVALID); diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in index 8bbbfb172700..a161ee0fabad 100644 --- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in +++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in @@ -1,29 +1,37 @@ ---- src/Makefile.in.orig 2008-09-29 17:30:53.000000000 -0400 -+++ src/Makefile.in 2008-09-29 17:35:03.000000000 -0400 -@@ -471,7 +471,7 @@ gnome_power_statistics_SOURCES = \ +--- src/Makefile.in.orig 2010-03-30 18:08:05.000000000 +0800 ++++ src/Makefile.in 2010-03-30 18:09:04.000000000 +0800 +@@ -497,6 +497,7 @@ + $(GNOME_LIBS) \ + $(UNIQUE_LIBS) \ + $(DBUS_LIBS) \ ++ -lexecinfo \ + -lm + + gnome_power_statistics_CFLAGS = \ +@@ -511,7 +512,7 @@ + + gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \ + $(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \ +- $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lm $(am__append_1) ++ $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_1) + gnome_power_preferences_CFLAGS = \ + $(WARNINGFLAGS) \ + $(NULL) +@@ -531,7 +532,7 @@ + gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \ + $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ + $(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \ +- $(DEVKIT_LIBS) -lm $(am__append_3) ++ $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_3) + gnome_power_manager_CFLAGS = \ + $(WARNINGFLAGS) \ $(NULL) +@@ -590,7 +591,7 @@ - gnome_power_statistics_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) \ -- $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) $(NULL) \ -+ $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) \ - $(am__append_1) - gnome_power_preferences_SOURCES = \ - egg-debug.h \ -@@ -499,7 +499,7 @@ gnome_power_preferences_SOURCES = \ - gnome_power_preferences_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(HAL_LIBS) \ - $(DBUS_LIBS) $(POLKIT_GNOME_LIBS) $(GPM_EXTRA_LIBS) \ - $(LOCAL_LIBHAL_LIBS) $(LOCAL_LIBDBUS_LIBS) \ -- $(LOCAL_LIBUNIQUE_LIBS) $(NULL) $(am__append_2) -+ $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) $(am__append_2) - gnome_power_manager_SOURCES = \ - egg-color.c \ - egg-color.h \ -@@ -588,7 +588,7 @@ gnome_power_manager_SOURCES = \ - gnome_power_manager_LDADD = $(GLIB_LIBS) $(GSTREAMER_LIBS) \ - $(GNOME_LIBS) $(HAL_LIBS) $(POLKIT_LIBS) $(DBUS_LIBS) \ - $(XRANDR_LIBS) $(GPM_EXTRA_LIBS) $(LOCAL_LIBHAL_LIBS) \ -- $(LOCAL_LIBDBUS_LIBS) $(NULL) $(am__append_3) -+ $(LOCAL_LIBDBUS_LIBS) -lexecinfo $(NULL) $(am__append_3) - gnome_power_self_test_SOURCES = \ - egg-color.c \ - egg-color.h \ + gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \ + $(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ +- $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lm $(am__append_4) ++ $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lexecinfo -lm $(am__append_4) + gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS) + BUILT_SOURCES = \ + org.gnome.PowerManager.h \ diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h b/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h deleted file mode 100644 index 8273665a522c..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/gpm-array-float.h.orig 2009-03-18 19:35:24.000000000 -0400 -+++ src/gpm-array-float.h 2009-03-18 19:35:42.000000000 -0400 -@@ -49,9 +49,9 @@ gfloat gpm_array_float_get_average (G - gboolean gpm_array_float_print (GArray *array); - GArray *gpm_array_float_convolve (GArray *data, - GArray *kernel); --inline gfloat gpm_array_float_get (GArray *array, -+gfloat gpm_array_float_get (GArray *array, - guint i); --inline void gpm_array_float_set (GArray *array, -+void gpm_array_float_set (GArray *array, - guint i, - gfloat value); - diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c b/sysutils/gnome-power-manager/files/patch-src_gpm-button.c deleted file mode 100644 index 7960d9f22d74..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/gpm-button.c.orig 2009-04-19 02:17:58.000000000 -0400 -+++ src/gpm-button.c 2009-04-19 02:20:39.000000000 -0400 -@@ -494,6 +494,25 @@ hal_daemon_stop_cb (HalGManager *hal_man - } - } - -+/* -+ * hal_daemon_new_device_cb -+ **/ -+static void -+hal_daemon_new_device_cb (HalGManager *hal_manager, const gchar *udi, GpmButton *button) -+{ -+ gboolean is_button; -+ HalGDevice *device; -+ -+ device = hal_gdevice_new (); -+ hal_gdevice_set_udi (device, udi); -+ hal_gdevice_query_capability (device, "button", &is_button, NULL); -+ if (is_button == TRUE) { -+ egg_debug ("Watching %s", udi); -+ watch_add_button (button, udi); -+ } -+ g_object_unref (device); -+} -+ - /** - * gpm_button_init: - * @button: This class instance -@@ -543,6 +562,8 @@ gpm_button_init (GpmButton *button) - G_CALLBACK (hal_daemon_start_cb), button); - g_signal_connect (button->priv->hal_manager, "daemon-stop", - G_CALLBACK (hal_daemon_stop_cb), button); -+ g_signal_connect (button->priv->hal_manager, "device-added", -+ G_CALLBACK (hal_daemon_new_device_cb), button); - - button->priv->hal_devicestore = hal_gdevicestore_new (); - diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c deleted file mode 100644 index ea8e92f03661..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gpm-cell-aray.c.orig 2009-10-24 19:59:07.000000000 -0400 -+++ src/gpm-cell-array.c 2009-10-24 19:59:50.000000000 -0400 -@@ -355,7 +355,8 @@ gpm_cell_array_update (GpmCellArray *cel - * get an with batteries which have a very small charge unit and consequently - * a very high charge. Fixes bug #327471 */ - if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY && -- unit->charge_current > 0 && unit->charge_last_full > 0) { -+ unit->charge_current > 0 && unit->charge_last_full > 0 && -+ unit->percentage > 1) { - gfloat pc = 100.0f * ((gfloat)unit->charge_current / - (gfloat)unit->charge_last_full); - if (pc < 0.0f) { diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c b/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c deleted file mode 100644 index 2b62e06643dd..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gpm-dpms.c.orig 2008-09-04 05:05:15.000000000 -0500 -+++ src/gpm-dpms.c 2010-05-07 08:36:53.000000000 -0500 -@@ -39,7 +39,7 @@ - #ifdef HAVE_DPMS_EXTENSION - #include <X11/Xproto.h> - #include <X11/extensions/dpms.h> --#include <X11/extensions/dpmsstr.h> -+#include <X11/extensions/dpmsproto.h> - #endif - - #include "gpm-conf.h" diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c index b9e08c982b72..eaa8df1b22aa 100644 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c +++ b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c @@ -1,5 +1,5 @@ ---- src/gpm-load.c.orig 2010-01-02 21:57:09.000000000 -0500 -+++ src/gpm-load.c 2010-01-02 21:59:16.000000000 -0500 +--- src/gpm-load.c.orig 2010-01-01 23:29:11.000000000 -0500 ++++ src/gpm-load.c 2010-01-01 23:46:31.000000000 -0500 @@ -33,6 +33,10 @@ #include <kstat.h> #include <sys/sysinfo.h> @@ -11,7 +11,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ -@@ -159,6 +163,32 @@ out: +@@ -151,6 +155,32 @@ out: return FALSE; } @@ -44,3 +44,12 @@ #else /** +@@ -192,7 +222,7 @@ gpm_load_get_cpu_values (long unsigned * + *cpu_total = cpu_user + cpu_nice + cpu_system + *cpu_idle; + ret = TRUE; + out: +- if (!fd) ++ if (fd) + fclose (fd); + return ret; + } |