summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-power-manager/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/gnome-power-manager/files')
-rw-r--r--sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in10
-rw-r--r--sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in10
-rw-r--r--sysutils/gnome-power-manager/files/patch-configure25
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_Makefile.in37
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-load.c55
5 files changed, 0 insertions, 137 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 a161ee0fa..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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_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-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;
- }