commit d27d91ff2a4020273f4b9d680d39672ae2eb82df
Author: Elan Ruusamäe <[email protected]>
Date: Tue Mar 19 19:10:27 2013 +0200
up to 1.5.2
bashism.patch | 19 ----
fa0afc54fc8b29ef3251b33cb55e590edb5e441e.patch | 137 -------------------------
mate-power-manager.spec | 19 ++--
systemd-fallback.patch | 77 --------------
use-gnome-keyring.patch | 56 +++++-----
use-libnotify.patch | 94 -----------------
6 files changed, 35 insertions(+), 367 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index d227a32..ee97d4a 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -4,18 +4,14 @@
Summary: MATE power management service
Name: mate-power-manager
-Version: 1.5.1
-Release: 6
+Version: 1.5.2
+Release: 1
License: GPL v2+
Group: X11/Applications
Source0:
http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# Source0-md5: 8ef2d2e6552461f88ac233377a5f5760
-Patch0: bashism.patch
+# Source0-md5: 62acf64566601883f41ce956b6c8f444
Patch1: use-gnome-keyring.patch
-Patch2: use-libnotify.patch
-Patch3: systemd-fallback.patch
Patch4: uidir.patch
-Patch5:
https://github.com/smkent/mate-power-manager/commit/fa0afc54fc8b29ef3251b33cb55e590edb5e441e.patch
URL: http://wiki.mate-desktop.org/mate-power-manager
BuildRequires: cairo-devel >= 1.0.0
BuildRequires: dbus-glib-devel
@@ -27,7 +23,7 @@ BuildRequires: gtk+2-devel >= 2:2.17.7
BuildRequires: libcanberra-devel
BuildRequires: libcanberra-gtk-devel
BuildRequires: libgnome-keyring-devel >= 0.6.0
-BuildRequires: libnotify-devel >= 0.7.5
+BuildRequires: libnotify-devel >= 0.7.0
BuildRequires: libunique-devel
BuildRequires: mate-common
BuildRequires: mate-doc-utils
@@ -55,12 +51,8 @@ MATE session.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
NOCONFIGURE=1 ./autogen.sh
@@ -79,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
INSTALL="install -p" \
DESTDIR=$RPM_BUILD_ROOT
+# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
+%{__rm}
$RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-power-manager.convert
+
%find_lang %{name} --with-mate --with-omf
desktop-file-install \
diff --git a/bashism.patch b/bashism.patch
deleted file mode 100644
index e90fa89..0000000
--- a/bashism.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mate-power-manager-1.5.1/man/Makefile.am~ 2012-11-23 04:26:10.000000000
+0200
-+++ mate-power-manager-1.5.1/man/Makefile.am 2013-02-16 23:48:58.764862729
+0200
-@@ -12,13 +12,13 @@
-
- if HAVE_DOCBOOK2MAN
- mate-power-manager.1: mate-power-manager.sgml
-- docbook2man $? &> /dev/null
-+ docbook2man $?
-
- mate-power-preferences.1: mate-power-preferences.sgml
-- docbook2man $? &> /dev/null
-+ docbook2man $?
-
- mate-power-statistics.1: mate-power-statistics.sgml
-- docbook2man $? &> /dev/null
-+ docbook2man $?
- endif
-
- clean-local :
diff --git a/fa0afc54fc8b29ef3251b33cb55e590edb5e441e.patch
b/fa0afc54fc8b29ef3251b33cb55e590edb5e441e.patch
deleted file mode 100644
index 6bdbe2d..0000000
--- a/fa0afc54fc8b29ef3251b33cb55e590edb5e441e.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From fa0afc54fc8b29ef3251b33cb55e590edb5e441e Mon Sep 17 00:00:00 2001
-From: Stephen Kent <[email protected]>
-Date: Sat, 24 Nov 2012 22:41:07 -0800
-Subject: [PATCH] Don't use the default backlight reduced-brightness value if
- exiting idle state. This means the pre-idle backlight
- brightness will be set instead of the default
- reduced-brightness value.
-
----
- src/gpm-backlight.c | 45 ++++++++++++++++++++++++---------------------
- 1 file changed, 24 insertions(+), 21 deletions(-)
-
-diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
-index 573778a..c2d58e2 100644
---- a/src/gpm-backlight.c
-+++ b/src/gpm-backlight.c
-@@ -269,7 +269,7 @@ enum {
- * gpm_backlight_brightness_evaluate_and_set:
- **/
- static gboolean
--gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean
interactive)
-+gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean
interactive, gboolean use_initial)
- {
- gfloat brightness;
- gfloat scale;
-@@ -303,19 +303,22 @@ enum {
- NULL);
-
- /* reduce if on battery power if we should */
-- battery_reduce = g_settings_get_boolean (backlight->priv->settings,
GPM_SETTINGS_BACKLIGHT_BATTERY_REDUCE);
-- if (on_battery && battery_reduce) {
-- value = g_settings_get_int (backlight->priv->settings,
GPM_SETTINGS_BRIGHTNESS_DIM_BATT);
-- if (value > 100) {
-- egg_warning ("cannot use battery brightness value %i,
correcting to 50", value);
-- value = 50;
-+ if (use_initial) {
-+ egg_debug ("Setting initial brightness level");
-+ battery_reduce = g_settings_get_boolean
(backlight->priv->settings, GPM_SETTINGS_BACKLIGHT_BATTERY_REDUCE);
-+ if (on_battery && battery_reduce) {
-+ value = g_settings_get_int (backlight->priv->settings,
GPM_SETTINGS_BRIGHTNESS_DIM_BATT);
-+ if (value > 100) {
-+ egg_warning ("cannot use battery brightness
value %i, correcting to 50", value);
-+ value = 50;
-+ }
-+ scale = (100 - value) / 100.0f;
-+ brightness *= scale;
-+ } else {
-+ scale = 1.0f;
- }
-- scale = (100 - value) / 100.0f;
-- brightness *= scale;
-- } else {
-- scale = 1.0f;
-+ egg_debug ("2. battery scale %f, brightness %f", scale,
brightness);
- }
-- egg_debug ("2. battery scale %f, brightness %f", scale, brightness);
-
- /* reduce if system is momentarily idle */
- if (!on_battery)
-@@ -379,17 +382,17 @@ enum {
-
- if (!on_battery && g_strcmp0 (key, GPM_SETTINGS_BRIGHTNESS_AC) == 0) {
- backlight->priv->master_percentage = g_settings_get_double
(settings, key);
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
TRUE);
-
- } else if (on_battery && g_strcmp0 (key,
GPM_SETTINGS_BRIGHTNESS_DIM_BATT) == 0) {
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
TRUE);
-
- } else if (g_strcmp0 (key, GPM_SETTINGS_IDLE_DIM_AC) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_BACKLIGHT_ENABLE) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_SLEEP_DISPLAY_BATT) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_BACKLIGHT_BATTERY_REDUCE) == 0
||
- g_strcmp0 (key, GPM_SETTINGS_IDLE_BRIGHTNESS) == 0) {
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
TRUE);
-
- } else if (g_strcmp0 (key, GPM_SETTINGS_IDLE_DIM_TIME) == 0) {
- backlight->priv->idle_dim_timeout = g_settings_get_int
(settings, key);
-@@ -409,7 +412,7 @@ enum {
- static void
- gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight)
- {
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE);
- }
-
- /**
-@@ -468,7 +471,7 @@ enum {
- }
- } else if (g_strcmp0 (type, GPM_BUTTON_LID_OPEN) == 0) {
- /* make sure we undim when we lift the lid */
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
TRUE);
-
- /* ensure backlight is on */
- ret = gpm_dpms_set_mode (backlight->priv->dpms,
GPM_DPMS_MODE_ON, &error);
-@@ -560,7 +563,7 @@ enum {
- if (mode == GPM_IDLE_MODE_NORMAL) {
- /* sync lcd brightness */
- gpm_backlight_notify_system_idle_changed (backlight, FALSE);
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
FALSE);
-
- /* ensure backlight is on */
- ret = gpm_dpms_set_mode (backlight->priv->dpms,
GPM_DPMS_MODE_ON, &error);
-@@ -573,7 +576,7 @@ enum {
-
- /* sync lcd brightness */
- gpm_backlight_notify_system_idle_changed (backlight, TRUE);
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
FALSE);
-
- /* ensure backlight is on */
- ret = gpm_dpms_set_mode (backlight->priv->dpms,
GPM_DPMS_MODE_ON, &error);
-@@ -586,7 +589,7 @@ enum {
-
- /* sync lcd brightness */
- gpm_backlight_notify_system_idle_changed (backlight, TRUE);
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE,
FALSE);
-
- /* get the DPMS state we're supposed to use on the power state
*/
- g_object_get (backlight->priv->client,
-@@ -772,7 +775,7 @@ enum {
- backlight->priv->consolekit = egg_console_kit_new ();
-
- /* sync at startup */
-- gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
-+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE);
- }
-
- /**
---
-1.7.10
-
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
deleted file mode 100644
index b5ded16..0000000
--- a/systemd-fallback.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- mate-power-manager-1.5.1/src/Makefile.am~ 2013-02-18 23:31:11.000000000
+0200
-+++ mate-power-manager-1.5.1/src/Makefile.am 2013-02-18 23:37:07.366519454
+0200
-@@ -190,6 +190,7 @@
- $(LIBNOTIFY_LIBS) \
- $(GPM_EXTRA_LIBS) \
- $(UPOWER_LIBS) \
-+ $(SYSTEMD_INHIBIT_LIBS) \
- -lm
-
- mate_power_manager_CFLAGS = \
---- mate-power-manager-1.5.1/src/gpm-manager.c 2013-02-18 22:44:55.699497700
+0200
-+++ mate-power-manager-1.5.1/src/gpm-manager.c 2013-02-18 22:55:33.785398083
+0200
-@@ -33,6 +33,9 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
-+#ifdef WITH_SYSTEMD_INHIBIT
-+#include <systemd/sd-daemon.h>
-+#endif /* WITH_SYSTEMD_INHIBIT */
-
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -1847,17 +1850,19 @@
- #ifdef WITH_SYSTEMD_INHIBIT
- /**
- * gpm_main_system_inhibit:
-+ *
-+ * Return a fd to the to the inhibitor, that we can close on exit.
-+ *
-+ * Return value: fd, -1 on error
- **/
- static gint32
- gpm_manager_systemd_inhibit (GDBusProxy *proxy) {
-- /* Return a fd to the to the inhibitor, that we can close on exit. */
-- //GDBusProxy *proxy;
- GError *error = NULL;
- gint32 r = -1;
- gint32 fd = -1;
- GVariant *res;
- GUnixFDList *fd_list = NULL;
-- //proxy == NULL;
-+
- /* Should we define these elsewhere? */
- const char* arg_what =
"handle-power-key:handle-suspend-key:handle-lid-switch";
- const char* arg_who = g_get_user_name ();
-@@ -1892,7 +1897,7 @@
- &fd_list,
- NULL,
- &error
-- );
-+ );
- if (error == NULL && res != NULL) {
- g_variant_get(res, "(h)", &r);
- egg_debug ("Inhibiting systemd sleep res = %i", r);
-@@ -1907,8 +1912,8 @@
- } else if (error != NULL || res == NULL) {
- egg_error ("Error in dbus - %s", error->message);
- g_error_free (error);
-- return -EIO;
-- }
-+ return -EIO;
-+ }
- egg_debug ("Inhibiting systemd sleep - success");
- return r;
- }
-@@ -1933,7 +1938,10 @@
-
- #ifdef WITH_SYSTEMD_INHIBIT
- /* We want to inhibit the systemd suspend options, and take care of them
ourselves */
-- manager->priv->systemd_inhibit = gpm_manager_systemd_inhibit
(manager->priv->systemd_inhibit_proxy);
-+ if (sd_booted() > 0) {
-+ manager->priv->systemd_inhibit = gpm_manager_systemd_inhibit
(manager->priv->systemd_inhibit_proxy);
-+ }
-+
- #endif
-
- /* init to unthrottled */
diff --git a/use-gnome-keyring.patch b/use-gnome-keyring.patch
index ab954ed..4850a10 100644
--- a/use-gnome-keyring.patch
+++ b/use-gnome-keyring.patch
@@ -9,8 +9,8 @@
- DBus (0.70 or later)
- libmatenotify (1.1.0 or later)
- Cairo (1.0.0 or later)
---- mate-power-manager-1.5.1/configure.ac 2012-11-23 04:26:11.000000000
+0200
-+++ mate-power-manager-1.5.1-gkr/configure.ac 2013-02-17 00:41:53.508141726
+0200
+--- mate-power-manager-1.5.2/configure.ac~ 2013-03-19 19:02:51.000000000
+0200
++++ mate-power-manager-1.5.2/configure.ac 2013-03-19 19:03:42.805800085
+0200
@@ -103,7 +103,7 @@
GIO_REQUIRED=2.25.0
GTK_REQUIRED=2.17.7
@@ -20,15 +20,15 @@
DBUS_REQUIRED=1.0
DBUS_GLIB_REQUIRED=0.70
LIBMATENOTIFY_REQUIRED=1.1.0
-@@ -151,7 +151,7 @@
+@@ -261,7 +261,7 @@
+ AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
- PKG_CHECK_MODULES(MATE, [
- gtk+-2.0 >= $GTK_REQUIRED
-- mate-keyring-1 >= $MATE_KEYRING_REQUIRED
-+ gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
- cairo >= $CAIRO_REQUIRED])
+ if test "$with_keyring" = "yes"; then
+- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED)
++ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
+ AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
+ fi
- PKG_CHECK_MODULES(GDK, [
--- mate-power-manager-1.5.1/data/org.mate.power-manager.gschema.xml.in
2012-11-23 04:26:11.000000000 +0200
+++ mate-power-manager-1.5.1-gkr/data/org.mate.power-manager.gschema.xml.in
2013-02-17 00:41:53.504808239 +0200
@@ -183,13 +183,13 @@
@@ -49,28 +49,28 @@
</key>
<key name="spindown-enable-ac" type="b">
<default>false</default>
---- mate-power-manager-1.5.1/src/gpm-control.c 2013-02-17 00:35:24.500170064
+0200
-+++ gnome-power-manager-2.32.0/src/gpm-control.c 2010-08-06
17:28:52.000000000 +0300
-@@ -39,7 +39,7 @@
- #include <glib/gi18n.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
+--- mate-power-manager-1.5.2/src/gpm-control.c~ 2013-03-19
19:02:51.000000000 +0200
++++ mate-power-manager-1.5.2/src/gpm-control.c 2013-03-19 19:04:50.842255183
+0200
+@@ -42,7 +33,7 @@
+ #include <libupower-glib/upower.h>
+
+ #ifdef WITH_KEYRING
-#include <mate-keyring.h>
+#include <gnome-keyring.h>
- #include <libupower-glib/upower.h>
+ #endif /* WITH_KEYRING */
#include "egg-debug.h"
-@@ -157,8 +157,8 @@
- gboolean ret = FALSE;
- gboolean do_lock;
- gboolean nm_sleep;
+@@ -163,8 +154,8 @@
+ GpmScreensaver *screensaver;
+ guint32 throttle_cookie = 0;
+ #ifdef WITH_KEYRING
- gboolean lock_mate_keyring;
- MateKeyringResult keyres;
+ gboolean lock_keyring;
+ GnomeKeyringResult keyres;
- GpmScreensaver *screensaver;
- guint32 throttle_cookie = 0;
+ #endif /* WITH_KEYRING */
+ screensaver = gpm_screensaver_new ();
@@ -174,10 +174,10 @@
}
@@ -86,17 +86,17 @@
egg_warning ("could not lock keyring");
}
-@@ -225,8 +225,8 @@
- gboolean ret = FALSE;
- gboolean do_lock;
- gboolean nm_sleep;
+@@ -235,8 +226,8 @@
+ GpmScreensaver *screensaver;
+ guint32 throttle_cookie = 0;
+ #ifdef WITH_KEYRING
- gboolean lock_mate_keyring;
- MateKeyringResult keyres;
+ gboolean lock_keyring;
+ GnomeKeyringResult keyres;
- GpmScreensaver *screensaver;
- guint32 throttle_cookie = 0;
+ #endif /* WITH_KEYRING */
+ screensaver = gpm_screensaver_new ();
@@ -242,10 +242,10 @@
}
diff --git a/use-libnotify.patch b/use-libnotify.patch
deleted file mode 100644
index f0ac6e0..0000000
--- a/use-libnotify.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- mate-power-manager-1.5.1/./configure.ac 2013-02-18 13:10:23.719300158
+0200
-+++ mate-power-manager-1.5.1/./configure.ac 2013-02-18 13:12:23.171483682
+0200
-@@ -106,7 +106,7 @@
- GNOME_KEYRING_REQUIRED=0.6.0
- DBUS_REQUIRED=1.0
- DBUS_GLIB_REQUIRED=0.70
--LIBMATENOTIFY_REQUIRED=1.1.0
-+LIBNOTIFY_REQUIRED=0.7.5
- CAIRO_REQUIRED=1.0.0
- UNIQUE_REQUIRED=0.9.4
- LIBPANEL_REQUIRED=1.5.0
-@@ -168,7 +168,7 @@
- [xrandr >= 1.3],
- [AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])])
-
--PKG_CHECK_MODULES(LIBMATENOTIFY, libmatenotify >= $LIBMATENOTIFY_REQUIRED)
-+PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-
- dnl
----------------------------------------------------------------------------
- dnl - Unique
---- mate-power-manager-1.5.0/src/gpm-manager.c.libnotify 2012-11-08
00:42:58.000000000 +0100
-+++ mate-power-manager-1.5.0/src/gpm-manager.c 2013-02-17 03:43:58.448430837
+0100
-@@ -40,7 +40,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <canberra-gtk.h>
- #include <libupower-glib/upower.h>
--#include <libmatenotify/notify.h>
-+#include <libnotify/notify.h>
-
- #include "egg-debug.h"
- #include "egg-console-kit.h"
-@@ -480,9 +480,9 @@ gpm_manager_notify (GpmManager *manager,
- /* if the status icon is hidden, don't point at it */
- if (manager->priv->status_icon != NULL &&
- gtk_status_icon_is_embedded (manager->priv->status_icon))
-- notification = notify_notification_new_with_status_icon (title,
message, icon, manager->priv->status_icon);
-+ notification = notify_notification_new (title, message,
gtk_status_icon_get_icon_name(manager->priv->status_icon));
- else
-- notification = notify_notification_new (title, message, icon,
NULL);
-+ notification = notify_notification_new (title, message, icon);
- notify_notification_set_timeout (notification, timeout);
- notify_notification_set_urgency (notification, urgency);
- g_signal_connect (notification, "closed", G_CALLBACK
(gpm_manager_notification_closed_cb), notification_class);
---- mate-power-manager-1.5.1/./applets/inhibit/Makefile.am~ 2012-11-23
04:26:11.000000000 +0200
-+++ mate-power-manager-1.5.1/./applets/inhibit/Makefile.am 2013-02-18
13:11:55.123521630 +0200
-@@ -4,7 +4,7 @@
- $(DBUS_CFLAGS) \
- $(MATE_CFLAGS) \
- $(PANEL_CFLAGS) \
-- $(LIBMATENOTIFY_CFLAGS) \
-+ $(LIBNOTIFY_CFLAGS) \
- $(GTKUNIQUE_CFLAGS) \
- -DBINDIR=\"$(bindir)\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
---- mate-power-manager-1.5.1/./applets/brightness/Makefile.am~ 2012-11-23
04:26:11.000000000 +0200
-+++ mate-power-manager-1.5.1/./applets/brightness/Makefile.am 2013-02-18
13:12:02.690537777 +0200
-@@ -4,7 +4,7 @@
- $(DBUS_CFLAGS) \
- $(MATE_CFLAGS) \
- $(PANEL_CFLAGS) \
-- $(LIBMATENOTIFY_CFLAGS) \
-+ $(LIBNOTIFY_CFLAGS) \
- $(GTKUNIQUE_CFLAGS) \
- -DBINDIR=\"$(bindir)\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
---- mate-power-manager-1.5.1/./src/Makefile.am 2013-02-18 13:12:11.624283712
+0200
-+++ mate-power-manager-1.5.1/./src/Makefile.am 2013-02-18 13:15:12.969325736
+0200
-@@ -15,7 +15,7 @@
- $(MATE_CFLAGS) \
- $(UNIQUE_CFLAGS) \
- $(X11_CFLAGS) \
-- $(LIBMATENOTIFY_CFLAGS) \
-+ $(LIBNOTIFY_CFLAGS) \
- $(CANBERRA_CFLAGS) \
- $(GSTREAMER_CFLAGS) \
- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
-@@ -187,7 +187,7 @@
- $(DBUS_LIBS) \
- $(X11_LIBS) \
- $(CANBERRA_LIBS) \
-- $(LIBMATENOTIFY_LIBS) \
-+ $(LIBNOTIFY_LIBS) \
- $(GPM_EXTRA_LIBS) \
- $(UPOWER_LIBS) \
- -lm
-@@ -254,7 +254,7 @@
- $(UPOWER_LIBS) \
- $(DBUS_LIBS) \
- $(X11_LIBS) \
-- $(LIBMATENOTIFY_LIBS) \
-+ $(LIBNOTIFY_LIBS) \
- $(GPM_EXTRA_LIBS) \
- -lm
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-power-manager.git/commitdiff/d27d91ff2a4020273f4b9d680d39672ae2eb82df
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
