[arch-commits] Commit in epiphany/repos/staging-i686 (2 files)

[Ionut Biru]

    Date: Sunday, March 6, 2011 @ 14:18:05
  Author: ibiru
Revision: 112786

add missing patches

Added:
  epiphany/repos/staging-i686/add-dbus-glib.patch
  epiphany/repos/staging-i686/epiphany-2.30.6-libnotify-0.7.patch

-------------------------------------+
 add-dbus-glib.patch                 |   20 +++++++++++++++++
 epiphany-2.30.6-libnotify-0.7.patch |   38 ++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

Added: add-dbus-glib.patch
===================================================================
--- add-dbus-glib.patch	                        (rev 0)
+++ add-dbus-glib.patch	2011-03-06 19:18:05 UTC (rev 112786)
@@ -0,0 +1,20 @@
+From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descalante at igalia.com>
+Date: Mon, 01 Nov 2010 05:56:51 +0000
+Subject: tests: DBUS_LIBS is needed for libephymain.la
+
+---
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bd2c378..b973214 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -23,6 +23,7 @@ LDADD = \
+ 	$(top_builddir)/lib/widgets/libephywidgets.la \
+ 	$(top_builddir)/lib/libephymisc.la \
+ 	$(top_builddir)/lib/egg/libegg.la \
++	$(DBUS_LIBS) \
+ 	$(DEPENDENCIES_LIBS) 
+ 
+ if ENABLE_NSS
+--
+cgit v0.8.3.4

Added: epiphany-2.30.6-libnotify-0.7.patch
===================================================================
--- epiphany-2.30.6-libnotify-0.7.patch	                        (rev 0)
+++ epiphany-2.30.6-libnotify-0.7.patch	2011-03-06 19:18:05 UTC (rev 112786)
@@ -0,0 +1,38 @@
+--- embed/downloader-view.c
++++ embed/downloader-view.c
+@@ -36,6 +36,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ enum
+@@ -337,7 +340,12 @@
+ 	g_object_ref (dv);
+ 
+ 	notification = notify_notification_new (title, msg,
+-						GTK_STOCK_INFO, NULL);
++						GTK_STOCK_INFO
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++						);
++#else
++						, NULL);
++#endif
+ 
+ 	g_signal_connect_after (notification, "closed",
+ 				G_CALLBACK (notification_closed_cb), dv);
+@@ -346,7 +354,11 @@
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	/* notify_notification_attach_to_status_icon was removed */
++#else
+ 	notify_notification_attach_to_status_icon (notification, status_icon);
++#endif
+ 
+ 	/* There are some visual glitches when the notification is shown and
+ 	 * the GtkStatusIcon is still not visible. To avoid that, we delay the