packages: gnome-mplayer/gnome-mplayer.spec, gnome-mplayer/gnome-mplayer-lib...

[lisu]

Author: lisu                         Date: Thu Apr  7 14:46:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with libnotify 0.7

---- Files affected:
packages/gnome-mplayer:
   gnome-mplayer.spec (1.28 -> 1.29) , gnome-mplayer-libnotify.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-mplayer/gnome-mplayer.spec
diff -u packages/gnome-mplayer/gnome-mplayer.spec:1.28 packages/gnome-mplayer/gnome-mplayer.spec:1.29
--- packages/gnome-mplayer/gnome-mplayer.spec:1.28	Thu Apr  7 16:36:15 2011
+++ packages/gnome-mplayer/gnome-mplayer.spec	Thu Apr  7 16:46:18 2011
@@ -12,6 +12,7 @@
 # Source0-md5:	335918da07a62941778444e126ae5ede
 Patch0:		%{name}-build.patch
 Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-libnotify.patch
 URL:		http://kdekorte.googlepages.com/gnomemplayer
 BuildRequires:	GConf2
 BuildRequires:	GConf2-devel
@@ -57,6 +58,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -102,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2011/04/07 14:46:18  lisu
+- fixed build with libnotify 0.7
+
 Revision 1.28  2011/04/07 14:36:15  lisu
 - rel 4
 

================================================================
Index: packages/gnome-mplayer/gnome-mplayer-libnotify.patch
diff -u /dev/null packages/gnome-mplayer/gnome-mplayer-libnotify.patch:1.1
--- /dev/null	Thu Apr  7 16:46:23 2011
+++ packages/gnome-mplayer/gnome-mplayer-libnotify.patch	Thu Apr  7 16:46:18 2011
@@ -0,0 +1,18 @@
+--- gnome-mplayer-0.9.9/src/gui.c~	2010-01-29 19:22:00.000000000 +0100
++++ gnome-mplayer-0.9.9/src/gui.c	2011-04-07 16:42:16.359914628 +0200
+@@ -417,10 +417,15 @@
+         if (show_notification && control_id == 0 && !gtk_window_is_active((GtkWindow *) window)) {
+             notify_init("gnome-mplayer");
+             notification =
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
+                 notify_notification_new(idle->display_name, idle->media_notification,
+                                         "gnome-mplayer", NULL);
+             if (show_status_icon)
+                 notify_notification_attach_to_status_icon(notification, status_icon);
++#else
++	        notify_notification_new(idle->display_name, idle->media_notification,
++					"gnome-mplayer");
++#endif
+             notify_notification_show(notification, NULL);
+             notify_uninit();
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-mplayer/gnome-mplayer.spec?r1=1.28&r2=1.29&f=u