diff options
Diffstat (limited to 'extra/epiphany')
-rw-r--r-- | extra/epiphany/add-dbus-glib.patch | 20 | ||||
-rw-r--r-- | extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch | 38 | ||||
-rw-r--r-- | extra/epiphany/fix-introspection.patch | 21 |
3 files changed, 0 insertions, 79 deletions
diff --git a/extra/epiphany/add-dbus-glib.patch b/extra/epiphany/add-dbus-glib.patch deleted file mode 100644 index c50be67a2..000000000 --- a/extra/epiphany/add-dbus-glib.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo <descalante@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 diff --git a/extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch b/extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch deleted file mode 100644 index a0c5f8ee1..000000000 --- a/extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 diff --git a/extra/epiphany/fix-introspection.patch b/extra/epiphany/fix-introspection.patch deleted file mode 100644 index 4d8dca923..000000000 --- a/extra/epiphany/fix-introspection.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Fri, 01 Oct 2010 16:36:23 +0000 -Subject: introspection: Fix build by telling g-ir-scanner what the prefix is - -https://bugzilla.gnome.org/show_bug.cgi?id=631119 ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index e9d3715..acbf8ff 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE - --include=WebKit-1.0 \ - --program=./epiphany \ - --output $@ \ -+ --strip-prefix=Ephy \ - --pkg epiphany-$(EPIPHANY_API_VERSION) \ - -DEPIPHANY_COMPILATION \ - -I$(top_srcdir)/embed \ --- -cgit v0.8.3.1 |