rpms/notification-daemon-engine-nodoka/devel sexy.patch, NONE, 1.1 notification-daemon-engine-nodoka.spec, 1.6, 1.7

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon-engine-nodoka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31708

Modified Files:
	notification-daemon-engine-nodoka.spec 
Added Files:
	sexy.patch 
Log Message:
drop libsexy dep


sexy.patch:

--- NEW FILE sexy.patch ---
diff -up notification-daemon-engine-nodoka-0.1.0/configure.ac.sexy notification-daemon-engine-nodoka-0.1.0/configure.ac
--- notification-daemon-engine-nodoka-0.1.0/configure.ac.sexy	2009-07-02 00:36:31.195289044 -0400
+++ notification-daemon-engine-nodoka-0.1.0/configure.ac	2009-07-02 00:36:41.615030951 -0400
@@ -40,12 +40,6 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(LIBSEXY, libsexy,,
-                   AC_MSG_ERROR([libsexy is required to compile nodoka]))
-
-AC_SUBST(LIBSEXY_CFLAGS)
-AC_SUBST(LIBSEXY_LIBS)
-
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_FILES([Makefile src/Makefile])
 
diff -up notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.sexy notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c
--- notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.sexy	2009-07-02 00:34:45.446017948 -0400
+++ notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c	2009-07-02 00:36:21.362018441 -0400
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <libsexy/sexy-url-label.h>
 
 /* Define basic nodoka types */
 typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
@@ -660,6 +659,14 @@ get_theme_info(char **theme_name,
 	*homepage = g_strdup("https://nodoka.fedorahosted.org/");
 }
 
+static gboolean
+activate_link (GtkLabel *label, const char *url, WindowData *windata)
+{
+  windata->url_clicked (windata->win, url);
+
+  return TRUE;
+
+}
 /* Create new notification */
 GtkWindow *
 create_notification(UrlClickedCb url_clicked)
@@ -805,12 +812,12 @@ create_notification(UrlClickedCb url_cli
 	gtk_widget_show(vbox);
 	gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
 
-	windata->body_label = sexy_url_label_new();
+	windata->body_label = gtk_label_new(NULL);
 	gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
 	gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
 	gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
-	g_signal_connect_swapped(G_OBJECT(windata->body_label), "url_activated",
-							 G_CALLBACK(windata->url_clicked), win);
+	g_signal_connect(G_OBJECT(windata->body_label), "activate-link",
+                         G_CALLBACK(activate_link), windata);
 
 	atkobj = gtk_widget_get_accessible(windata->body_label);
 	atk_object_set_description(atkobj, "Notification body text.");


Index: notification-daemon-engine-nodoka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-nodoka/devel/notification-daemon-engine-nodoka.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- notification-daemon-engine-nodoka.spec	20 Jun 2009 07:16:33 -0000	1.6
+++ notification-daemon-engine-nodoka.spec	2 Jul 2009 04:39:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-nodoka
 Version:        0.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Nodoka theme engine for the notification daemon
 
 Group:          System Environment/Libraries 
@@ -11,9 +11,11 @@ Patch0:         notification-daemon-engi
 Patch1:         notification-daemon-engine-nodoka-0.1.0-version-check.patch
 Patch2:         notification-daemon-engine-nodoka-rtl.patch
 Patch3:         notification-daemon-engine-nodoka-base-color.patch
+# drop libsexy dep
+Patch4:		sexy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsexy-devel
+BuildRequires:  gtk2-devel >= 2.17.1
 BuildRequires:  libxml2-devel
 Requires:       notification-daemon
 
@@ -27,6 +29,7 @@ The Nodoka theme engine for the notifica
 %patch1 -p1 -b .version-check
 %patch2 -p1 -b .rtl
 %patch3 -p1 -b .base-color
+%patch4 -p1 -b .sexy
 
 %build
 %configure
@@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libnodoka.so
 
 %changelog
+* Thu Jul  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.1.0-8
+- Drop libsexy dep
+
 * Sat Jun 20 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.0-7
 - Use gtkrc specified color for background (fixes rhbz #498422)