summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-power-manager/files
diff options
context:
space:
mode:
authoravl <avl@df743ca5-7f9a-e211-a948-0013205c9059>2010-03-30 18:37:11 +0800
committeravl <avl@df743ca5-7f9a-e211-a948-0013205c9059>2010-03-30 18:37:11 +0800
commita5469bc5475f73d47e957f928ae6e6f434a19198 (patch)
tree8d5d6b8d39220c98bc836cbbf9bd97150e58e5e1 /sysutils/gnome-power-manager/files
parent164034365598fd687a6fa505d6ff59f86917a268 (diff)
downloadmarcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.tar
marcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.tar.gz
marcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.tar.bz2
marcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.tar.lz
marcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.tar.xz
marcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.tar.zst
marcuscom-ports-a5469bc5475f73d47e957f928ae6e6f434a19198.zip
Update to 2.30.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13903 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-power-manager/files')
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_Makefile.in16
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c10
2 files changed, 8 insertions, 18 deletions
diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
index d715644c7..a161ee0fa 100644
--- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in
+++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig 2010-01-01 21:02:44.000000000 +0800
-+++ src/Makefile.in 2010-01-01 21:03:47.000000000 +0800
-@@ -514,6 +514,7 @@
+--- 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) \
@@ -8,7 +8,7 @@
-lm
gnome_power_statistics_CFLAGS = \
-@@ -528,7 +529,7 @@
+@@ -511,7 +512,7 @@
gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \
$(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \
@@ -17,19 +17,19 @@
gnome_power_preferences_CFLAGS = \
$(WARNINGFLAGS) \
$(NULL)
-@@ -548,7 +549,7 @@
+@@ -531,7 +532,7 @@
gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \
- $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(XRANDR_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)
-@@ -607,7 +608,7 @@
+@@ -590,7 +591,7 @@
gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \
- $(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_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)
diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c b/sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c
deleted file mode 100644
index eb0578931..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gpm-brightness-hal.c.orig 2010-03-02 15:05:33.000000000 +0800
-+++ src/gpm-brightness-hal.c 2010-03-02 15:06:07.000000000 +0800
-@@ -441,6 +441,7 @@
- HalDevice *device;
- gboolean res;
- DBusGConnection *connection;
-+ GError *error = NULL;
-
- brightness->priv = GPM_BRIGHTNESS_HAL_GET_PRIVATE (brightness);
- brightness->priv->proxy = NULL;