Hello community,

here is the log from the commit of package hp-drive-guard for openSUSE:Factory
checked in at Wed Jun 29 09:58:03 CEST 2011.



--------
--- hp-drive-guard/hp-drive-guard.changes       2010-09-15 10:24:39.000000000 
+0200
+++ /mounts/work_src_done/STABLE/hp-drive-guard/hp-drive-guard.changes  
2011-06-28 13:13:33.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 28 13:12:40 CEST 2011 - [email protected]
+
+- Fix build with new libnotify on FACTORY
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  0002-Fix-build-with-the-new-libnotify.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hp-drive-guard.spec ++++++
--- /var/tmp/diff_new_pack.x128t8/_old  2011-06-29 09:57:30.000000000 +0200
+++ /var/tmp/diff_new_pack.x128t8/_new  2011-06-29 09:57:30.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package hp-drive-guard (Version 0.3.12)
+# spec file for package hp-drive-guard
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,10 +32,11 @@
 License:        GPLv2+
 Group:          Hardware/Mobile
 Version:        0.3.12
-Release:        2
+Release:        6
 Summary:        HP DriveGuard for SuSE
 Source:         hp-drive-guard-%{version}.tar.bz2
 Patch1:         0001-Fix-misc-compile-warnings.patch
+Patch2:         0002-Fix-build-with-the-new-libnotify.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -53,6 +54,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %if %suse_version > 1120
 %define pm_method      upower

++++++ 0002-Fix-build-with-the-new-libnotify.patch ++++++
>From 03d63a1c3f70d651ffd31925dc2f0392c5513965 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 28 Jun 2011 13:11:33 +0200
Subject: [PATCH] Fix build with the new libnotify

The new libnotify has no longer notify_notification_new_with_status_icon().

Signed-off-by: Takashi Iwai <[email protected]>
---
 src/client.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/client.c b/src/client.c
index f992338..81f564d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -36,6 +36,10 @@
 #include <gtk/gtk.h>
 #include <libnotify/notify.h>
 
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x, y, z)   0
+#endif
+
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -194,11 +198,18 @@ init_state_change_notification (DriveGuard *drive_guard)
 
   drive_guard->current_notification = -1;
   for (n = 0; n < 2; n++) {
+#if NOTIFY_CHECK_VERSION(0, 7, 0)
+    drive_guard->notifications [n] =
+    notify_notification_new (gettext (message [n].summary),
+                             gettext (message [n].body),
+                             message [n].icon);
+#else
     drive_guard->notifications [n] =
     notify_notification_new_with_status_icon (gettext (message [n].summary),
                                               gettext (message [n].body),
                                               message [n].icon,
                                               drive_guard->status_icon);
+#endif
     notify_notification_set_urgency (drive_guard->notifications [n], message 
[n].urgency);
     notify_notification_set_timeout (drive_guard->notifications [n], message 
[n].timeout);
     /* first show to let system caching... */
-- 
1.7.6


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to