[packages/mate-notification-daemon] use libnotify and libwnck, not mate forks

glen glen at pld-linux.org
Sun Feb 17 21:35:17 CET 2013 

commit a1fd93017677f60750a6c150a4bbc27ef05f2a39
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Feb 17 22:34:22 2013 +0200

    use libnotify and libwnck, not mate forks
    
    patches by spturtle, from
    http://www.time4t.net/~cjw/mageia/cauldron/SOURCES/mate-notification-daemon-1.5.0-libwnck.patch
    http://www.time4t.net/~cjw/mageia/cauldron/SOURCES/mate-notification-daemon-1.5.0-libnotify.patch

 mate-notification-daemon.spec |  8 +++--
 use-libnotify.patch           | 31 ++++++++++++++++++
 use-libwnck.patch             | 73 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+), 2 deletions(-)
---
diff --git a/mate-notification-daemon.spec b/mate-notification-daemon.spec
index e8eb23b..a548e1e 100644
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@ -6,9 +6,11 @@ Name:		mate-notification-daemon
 Version:	1.5.1
 Release:	1
 License:	GPL v2+
+Group:		Applications/System
 Source0:	http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 # Source0-md5:	7df51649d029d187fb2e0dbb8f7ecb4d
-Group:		Applications/System
+Patch0:		use-libnotify.patch
+Patch1:		use-libwnck.patch
 URL:		http://wiki.mate-desktop.org/mate-notification-daemon
 BuildRequires:	dbus-devel >= 0.78
 BuildRequires:	dbus-glib-devel >= 0.78
@@ -19,7 +21,7 @@ BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libcanberra-devel
 BuildRequires:	libcanberra-gtk-devel >= 0.4
 BuildRequires:	libmatenotify-devel
-BuildRequires:	libmatewnck-devel
+BuildRequires:	libwnck-devel
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
 BuildRequires:	tar >= 1:1.22
@@ -42,6 +44,8 @@ Notification daemon for MATE Desktop.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
diff --git a/use-libnotify.patch b/use-libnotify.patch
new file mode 100644
index 0000000..6fbe903
--- /dev/null
+++ b/use-libnotify.patch
@@ -0,0 +1,31 @@
+--- mate-notification-daemon-1.5.0/configure.ac.0000	2012-10-21 11:47:02.000000000 +0200
++++ mate-notification-daemon-1.5.0/configure.ac	2013-01-21 00:24:44.730096960 +0100
+@@ -133,7 +133,7 @@ AC_SUBST(NOTIFICATION_DAEMON_LIBS)
+ dnl ---------------------------------------------------------------------------
+ dnl Requirements for the setup tool
+ dnl ---------------------------------------------------------------------------
+-PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GIO_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libmatenotify dbus-1 dbus-glib-1)
++PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GIO_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libnotify dbus-1 dbus-glib-1)
+ AC_SUBST(NOTIFICATION_CAPPLET_CFLAGS)
+ AC_SUBST(NOTIFICATION_CAPPLET_LIBS)
+ 
+--- mate-notification-daemon-1.5.0/src/capplet/mate-notification-properties.c.0000	2012-10-21 11:47:02.000000000 +0200
++++ mate-notification-daemon-1.5.0/src/capplet/mate-notification-properties.c	2013-01-21 00:31:35.201617517 +0100
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <string.h>
+-#include <libmatenotify/notify.h>
++#include <libnotify/notify.h>
+ 
+ #include "stack.h"
+ 
+@@ -311,7 +311,7 @@ static void notification_properties_dial
+ 		dialog->preview = NULL;
+ 	}
+ 
+-	dialog->preview = notify_notification_new(_("Notification Test"), _("Just a test"), "dialog-information", NULL);
++	dialog->preview = notify_notification_new(_("Notification Test"), _("Just a test"), "dialog-information");
+ 
+ 	if (!notify_notification_show(dialog->preview, &error))
+ 	{
diff --git a/use-libwnck.patch b/use-libwnck.patch
new file mode 100644
index 0000000..0e64dda
--- /dev/null
+++ b/use-libwnck.patch
@@ -0,0 +1,73 @@
+--- mate-notification-daemon-1.5.0/configure.ac.0001	2013-02-17 02:52:47.604932539 +0100
++++ mate-notification-daemon-1.5.0/configure.ac	2013-02-17 02:52:47.636932246 +0100
+@@ -123,7 +123,7 @@ pkg_modules="
+ 	dbus-1 >= $REQ_DBUS_VERSION, \
+ 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
+         libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \
+-	libmatewnck \
++	libwnck-1.0 \
+         x11 \
+ "
+ PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
+--- mate-notification-daemon-1.5.0/src/daemon/daemon.c.0001	2012-10-21 11:47:02.000000000 +0200
++++ mate-notification-daemon-1.5.0/src/daemon/daemon.c	2013-02-17 02:56:21.691968653 +0100
+@@ -42,7 +42,8 @@
+ #include <X11/Xatom.h>
+ #include <gdk/gdkx.h>
+ 
+-#include <libmatewnck/libmatewnck.h>
++#define WNCK_I_KNOW_THIS_IS_UNSTABLE
++#include <libwnck/libwnck.h>
+ 
+ #include "daemon.h"
+ #include "engines.h"
+@@ -1147,36 +1148,36 @@ static gboolean screensaver_active(GtkWi
+ 
+ static gboolean fullscreen_window_exists(GtkWidget* nw)
+ {
+-	MatewnckScreen* matewnck_screen;
+-	MatewnckWorkspace* matewnck_workspace;
++	WnckScreen* wnck_screen;
++	WnckWorkspace* wnck_workspace;
+ 	GList* l;
+ 
+ 	#if (GDK_PIXBUF_MAJOR == 2) && (GDK_PIXBUF_MINOR < 22)
+-		matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
++		wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
+ 	#else
+-		matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
++		wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
+ 	#endif
+ 
+-    matewnck_screen_force_update (matewnck_screen);
++    wnck_screen_force_update (wnck_screen);
+ 
+-	matewnck_workspace = matewnck_screen_get_active_workspace (matewnck_screen);
++	wnck_workspace = wnck_screen_get_active_workspace (wnck_screen);
+ 
+-	for (l = matewnck_screen_get_windows_stacked (matewnck_screen); l != NULL; l = l->next)
++	for (l = wnck_screen_get_windows_stacked (wnck_screen); l != NULL; l = l->next)
+ 	{
+-		MatewnckWindow *matewnck_win = (MatewnckWindow *) l->data;
++		WnckWindow *wnck_win = (WnckWindow *) l->data;
+ 
+-		if (matewnck_window_is_on_workspace (matewnck_win, matewnck_workspace) && matewnck_window_is_fullscreen (matewnck_win) && matewnck_window_is_active (matewnck_win))
++		if (wnck_window_is_on_workspace (wnck_win, wnck_workspace) && wnck_window_is_fullscreen (wnck_win) && wnck_window_is_active (wnck_win))
+ 		{
+ 			/*
+ 			 * Sanity check if the window is _really_ fullscreen to
+-			 * work around a bug in libmatewnck that doesn't get all
++			 * work around a bug in libwnck that doesn't get all
+ 			 * unfullscreen events.
+ 			 */
+-			int sw = matewnck_screen_get_width (matewnck_screen);
+-			int sh = matewnck_screen_get_height (matewnck_screen);
++			int sw = wnck_screen_get_width (wnck_screen);
++			int sh = wnck_screen_get_height (wnck_screen);
+ 			int x, y, w, h;
+ 
+-			matewnck_window_get_geometry (matewnck_win, &x, &y, &w, &h);
++			wnck_window_get_geometry (wnck_win, &x, &y, &w, &h);
+ 
+ 			if (sw == w && sh == h)
+ 			{
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-notification-daemon.git/commitdiff/a1fd93017677f60750a6c150a4bbc27ef05f2a39

More information about the pld-cvs-commit mailing list