diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
commit | 2e4d2e942a99fbc51adebabc4cd543a91491ba37 (patch) | |
tree | 5fb7c33c9eb700d394e22ec7c7faf4258b91ea3b /sysutils/gnome-power-manager/files | |
parent | 2d95636f2e1c4896bca367221f0b972b5903e72a (diff) | |
download | marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.gz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.bz2 marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.lz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.xz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.zst marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.zip |
Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of
focus issues. And it doesn't seem it getting any traction upstream.
Next stop GNOME 3.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-power-manager/files')
5 files changed, 0 insertions, 134 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 deleted file mode 100644 index 9a5d2c5a5..000000000 --- a/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 4965221fe..000000000 --- a/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 69d50145e..000000000 --- a/sysutils/gnome-power-manager/files/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ ---- 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-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in deleted file mode 100644 index 0f4da29db..000000000 --- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ ---- src/Makefile.in.orig 2010-06-06 12:19:04.000000000 +0200 -+++ src/Makefile.in 2010-06-06 12:21:46.000000000 +0200 -@@ -499,6 +499,7 @@ - $(GNOME_LIBS) \ - $(UNIQUE_LIBS) \ - $(DBUS_LIBS) \ -+ -lexecinfo \ - -lm - - gnome_power_statistics_CFLAGS = \ -@@ -520,6 +521,7 @@ - $(UNIQUE_LIBS) \ - $(GPM_EXTRA_LIBS) \ - $(UPOWER_LIBS) \ -+ -lexecinfo \ - -lm - - gnome_power_preferences_CFLAGS = \ -@@ -573,6 +575,7 @@ - $(LIBNOTIFY_LIBS) \ - $(GPM_EXTRA_LIBS) \ - $(UPOWER_LIBS) \ -+ -lexecinfo \ - -lm - - gnome_power_manager_CFLAGS = \ -@@ -639,6 +642,7 @@ - $(X11_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(GPM_EXTRA_LIBS) \ -+ -lexecinfo \ - -lm - - gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS) diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c deleted file mode 100644 index eaa8df1b2..000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c +++ /dev/null @@ -1,55 +0,0 @@ ---- 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> - #endif -+#if defined(__FreeBSD__) -+#include <sys/resource.h> -+#include <sys/sysctl.h> -+#endif - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif /* HAVE_UNISTD_H */ -@@ -151,6 +155,32 @@ out: - return FALSE; - } - -+#elif defined(__FreeBSD__) -+ -+/** -+ * gpm_load_get_cpu_values: -+ * @cpu_idle: The idle time reported by the CPU -+ * @cpu_total: The total time reported by the CPU -+ * Return value: Success of reading of the kern.cp_time sysctl. -+ **/ -+static gboolean -+gpm_load_get_cpu_values (long unsigned *cpu_idle, long unsigned *cpu_total) -+{ -+ long cpts[CPUSTATES]; -+ size_t length; -+ -+ length = sizeof (cpts); -+ if (sysctlbyname ("kern.cp_time", cpts, &length, NULL, 0)) { -+ return FALSE; -+ } -+ -+ *cpu_idle = (unsigned long) cpts[CP_IDLE]; -+ *cpu_total = (unsigned long) (cpts[CP_USER] + cpts[CP_NICE] + \ -+ cpts[CP_SYS] + cpts[CP_IDLE] + cpts[CP_INTR]); -+ -+ return TRUE; -+} -+ - #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; - } |