From 3be02a9acbeb006d9a9e6136c54d91064cc7d80e Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 2 May 2011 00:29:16 +0000 Subject: Mon May 2 00:29:22 UTC 2011 --- extra/gnome-applets/add-dbus-glib.patch | 28 ------------ .../gnome-applets-2.32.1.1-libnotify-0.7.patch | 53 ---------------------- 2 files changed, 81 deletions(-) delete mode 100644 extra/gnome-applets/add-dbus-glib.patch delete mode 100644 extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch (limited to 'extra/gnome-applets') diff --git a/extra/gnome-applets/add-dbus-glib.patch b/extra/gnome-applets/add-dbus-glib.patch deleted file mode 100644 index 16c2999a8..000000000 --- a/extra/gnome-applets/add-dbus-glib.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001 -From: Enrico Minack -Date: Mon, 03 Jan 2011 19:58:13 +0000 -Subject: gweather: fixes NetworkManager support to compile, see bug 636217 - ---- -diff --git a/gweather/Makefile.am b/gweather/Makefile.am -index ea6ac96..165efda 100644 ---- a/gweather/Makefile.am -+++ b/gweather/Makefile.am -@@ -6,6 +6,7 @@ INCLUDES = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \ -+ $(DBUS_CFLAGS) \ - $(GNOME_APPLETS3_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(LIBGWEATHER_CFLAGS) \ -@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \ - gweather-applet.c gweather-applet.h - - gweather_applet_2_LDADD = \ -+ $(DBUS_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(GNOME_APPLETS3_LIBS) \ - $(GNOME_LIBS2_LIBS) \ --- -cgit v0.8.3.4 diff --git a/extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch b/extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch deleted file mode 100644 index f2b889ec0..000000000 --- a/extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- battstat/battstat_applet.c -+++ battstat/battstat_applet.c -@@ -42,6 +42,9 @@ - - #ifdef HAVE_LIBNOTIFY - #include -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #include "battstat.h" -@@ -435,7 +438,12 @@ - GTK_ICON_LOOKUP_USE_BUILTIN, - NULL); - -- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet); -+ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , applet); -+#endif - - /* XXX: it would be nice to pass this as a named icon */ - notify_notification_set_icon_from_pixbuf (n, icon); ---- gweather/gweather-applet.c -+++ gweather/gweather-applet.c -@@ -30,6 +30,9 @@ - #ifdef HAVE_LIBNOTIFY - #include - #include -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE -@@ -471,8 +474,12 @@ - if (icon == NULL) - icon = "stock-unknown"; - -- n = notify_notification_new (message, detail, icon, -- gw_applet->container); -+ n = notify_notification_new (message, detail, icon -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , gw_applet->container); -+#endif - - notify_notification_show (n, &error); - if (error) -- cgit v1.2.3-54-g00ecf