summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/epiphany/files')
-rw-r--r--www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch21
-rw-r--r--www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch17
-rw-r--r--www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch48
-rw-r--r--www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch17
-rw-r--r--www-client/epiphany/files/epiphany-2.26.3-glib.patch22
-rw-r--r--www-client/epiphany/files/epiphany-2.26.3-nspr.patch14
-rw-r--r--www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch39
-rw-r--r--www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch24
-rw-r--r--www-client/epiphany/files/epiphany-2.26.3-xul192.patch14
9 files changed, 0 insertions, 216 deletions
diff --git a/www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch b/www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch
deleted file mode 100644
index 5ca8cd07881c..000000000000
--- a/www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Running the test program as root inside a sandbox causes access violations
-
-See bug 263585
-
-Patch by Jory A. Pratt
-
----
---- configure.ac
-+++ configure.ac
-@@ -315,11 +315,6 @@
- # now tests for mozilla API variance
- # **********************************
-
--# First build a test program to see whether compiling and running XPCOM
--# programs works at all, so we don't get false test failures below
--
--GECKO_XPCOM_PROGRAM_CHECK
--
- # Check for PSM header(s) to infer PSM presence
-
- GECKO_CHECK_HEADERS([pipnss],[nsIX509Cert.h],[have_psm=yes],[have_psm=no])
diff --git a/www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch b/www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch
deleted file mode 100644
index c3ba4d4a588d..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
-https://bugs.gentoo.org/show_bug.cgi?id=263990
-
-Fix compilation against xulrunner 1.9.1_beta3
-
-diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
-index 81cd2fa..dfdef4e 100644
---- a/embed/mozilla/MozRegisterComponents.cpp
-+++ b/embed/mozilla/MozRegisterComponents.cpp
-@@ -46,6 +46,7 @@
- #include <nsIClassInfoImpl.h>
- #include <nsXULAppAPI.h>
- #include <nsToolkitCompsCID.h>
-+#include <nsXPCOMCIDInternal.h>
- #endif
-
- #ifdef HAVE_MOZILLA_PSM
diff --git a/www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch b/www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch
deleted file mode 100644
index 095dc2577ffc..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch
+++ /dev/null
@@ -1,48 +0,0 @@
----
- Fix automagic libcanberra detection.
-
- Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=266232
- Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=579031
-
- configure.ac | 20 ++++++++++++++++----
- 1 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 90ed936..61b10de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -118,13 +118,24 @@ LIBCANBERRA_GTK_REQUIRED=0.3
- DBUS_GLIB_REQUIRED=0.35
-
- PKG_CHECK_EXISTS([libnotify >= $LIBNOTIFY_REQUIRED],[have_libnotify=yes],[have_libnotify=no])
--PKG_CHECK_EXISTS([libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED],[have_libcanberra_gtk=yes],[have_libcanberra_gtk=no])
-+
-+AC_ARG_ENABLE([canberra],
-+ AC_HELP_STRING([--enable-canberra],
-+ [Enable canberra support @<:@default=yes@:>@]),
-+ enable_canberra=$enableval, enable_canberra=yes)
-
- LIBCANBERRA_GTK_PACKAGE=
--if test "$have_libcanberra_gtk" = "yes"; then
-- LIBCANBERRA_GTK_PACKAGE="libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED"
-- AC_DEFINE([HAVE_LIBCANBERRA_GTK],[1],[Define if libcanberra-gtk is available])
-+have_libcanberra_gtk=no
-+if test "$enable_canberra" = "yes"; then
-+ PKG_CHECK_EXISTS([libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED],[have_libcanberra_gtk=yes],
-+ [have_libcanberra_gtk=no])
-+
-+ if test "$have_libcanberra_gtk" = "yes"; then
-+ LIBCANBERRA_GTK_PACKAGE="libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED"
-+ AC_DEFINE([HAVE_LIBCANBERRA_GTK],[1],[Define if libcanberra-gtk is available])
-+ fi
- fi
-+
- LIBNOTIFY_PACKAGE=
- if test "$have_libnotify" = "yes"; then
- LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
-@@ -772,4 +783,5 @@ Epiphany was configured with the following options:
-
- Gecko backend : $gecko_cv_gecko version $gecko_cv_gecko_version
- PSM support : $enable_psm
-+ Canberra support : $have_libcanberra_gtk
- "
diff --git a/www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch b/www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch
deleted file mode 100644
index c7158aee90e2..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=290024
-
-Ephy does not display favicon of most websites due to a missing pattern match,
-for "image/vnd.microsoft.icon" mimetype.
-
-Index: epiphany/embed/ephy-favicon-cache.c
-===================================================================
---- epiphany.orig/embed/ephy-favicon-cache.c 2009-05-21 09:53:41.207975209 -0400
-+++ epiphany/embed/ephy-favicon-cache.c 2009-05-21 09:54:28.061689298 -0400
-@@ -696,6 +696,7 @@
- return NULL;
- }
- valid = strcmp (mime_type, "image/x-ico") == 0 ||
-+ strcmp (mime_type, "image/vnd.microsoft.icon") == 0 ||
- strcmp (mime_type, "image/png") == 0 ||
- strcmp (mime_type, "image/gif") == 0;
- is_ao = strcmp (mime_type, "application/octet-stream") == 0;
diff --git a/www-client/epiphany/files/epiphany-2.26.3-glib.patch b/www-client/epiphany/files/epiphany-2.26.3-glib.patch
deleted file mode 100644
index 0d99a3040559..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.3-glib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- embed/ephy-embed-shell.c.old 2010-03-10 11:43:01.773638266 +0000
-+++ embed/ephy-embed-shell.c 2010-03-10 11:43:21.957638633 +0000
-@@ -21,6 +21,7 @@
- #include <config.h>
-
- #include <glib.h>
-+#include <glib/gstdio.h>
-
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-
---- embed/ephy-favicon-cache.c.old 2010-03-10 11:45:38.433638346 +0000
-+++ embed/ephy-favicon-cache.c 2010-03-10 11:46:05.265637902 +0000
-@@ -39,6 +39,8 @@
- #include "ephy-glib-compat.h"
-
- #include <glib.h>
-+#include <glib/gstdio.h>
-+
- #include <gio/gio.h>
-
- #define EPHY_FAVICON_CACHE_XML_ROOT (const xmlChar *)"ephy_favicons_cache"
diff --git a/www-client/epiphany/files/epiphany-2.26.3-nspr.patch b/www-client/epiphany/files/epiphany-2.26.3-nspr.patch
deleted file mode 100644
index cef222b95dd9..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.3-nspr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.old 2010-03-01 17:07:05.000000000 +0000
-+++ configure.ac 2010-03-01 17:07:33.000000000 +0000
-@@ -532,9 +532,9 @@ AC_MSG_RESULT([$enable_desktop_file_plug
-
- if test "$enable_desktop_file_plugin" = "yes"; then
- if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
-- PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
-+ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0 nspr])
- else
-- PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
-+ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0 nspr])
- fi
- AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
- AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
diff --git a/www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch b/www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch
deleted file mode 100644
index b90f667afa04..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Pacho Ramos <pacho@gentoo.org>
-Date: Wed, 06 Jan 2010 14:17:24 +0000
-Subject: Revert upstream commit 7dbe33b5bfd99ff4ef116f8ccf4777edd8ade788
-(Chdir to / in the factory, so we don't hog any mountpoints.)
-Discussed in:
-https://bugzilla.gnome.org/show_bug.cgi?id=583616
-http://bugs.gentoo.org/show_bug.cgi?id=292867
----
---- lib/ephy-file-chooser.c~ 2009-05-28 21:26:21.000000000 +0200
-+++ lib/ephy-file-chooser.c 2010-01-06 15:13:23.000000000 +0100
-@@ -375,7 +375,6 @@
- * run.
- */
-
-- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_home_dir ());
-
- if (persist_key != NULL)
- {
---- lib/ephy-file-helpers.c~ 2009-05-28 21:26:21.000000000 +0200
-+++ lib/ephy-file-helpers.c 2010-01-06 15:14:09.000000000 +0100
-@@ -33,7 +33,6 @@
- #include "ephy-string.h"
-
- #include <glib.h>
--#include <glib/gstdio.h>
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- #include <gio/gdesktopappinfo.h>
-@@ -264,10 +263,6 @@
- {
- const char *uuid;
-
-- /* Make sure the server process doesn't hog any mountpoints! */
-- if (chdir ("/") < 0)
-- g_warning ("Failed to chdir to /: %s", g_strerror (errno));
--
- /* See if we've been calling ourself, and abort if we have */
- uuid = g_getenv (EPHY_UUID_ENVVAR);
- if (uuid && strcmp (uuid, EPHY_UUID) == 0)
diff --git a/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch b/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch
deleted file mode 100644
index 71b408141e76..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Allow plugins installed in system to be used
-# Gentoo: https://bugs.gentoo.org/attachment.cgi?id=199400
---- a/embed/mozilla/Makefile.am 2009-07-27 21:18:46.658006845 -0500
-+++ b/embed/mozilla/Makefile.am 2009-07-27 21:19:46.633007194 -0500
-@@ -161,7 +161,7 @@
- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
- -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
- -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/nsbrowser/plugins\" \
- -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
- -DALLOW_PRIVATE_API \
- $(AM_CPPFLAGS)
---- a/embed/mozilla/Makefile.in 2009-07-27 21:18:53.673984077 -0500
-+++ b/embed/mozilla/Makefile.in 2009-07-27 21:20:06.010983867 -0500
-@@ -493,7 +493,7 @@
- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
- -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
- -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/nsbrowser/plugins\" \
- -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" -DALLOW_PRIVATE_API \
- $(AM_CPPFLAGS) $(am__append_7)
- libephymozillaembed_la_CXXFLAGS = \
diff --git a/www-client/epiphany/files/epiphany-2.26.3-xul192.patch b/www-client/epiphany/files/epiphany-2.26.3-xul192.patch
deleted file mode 100644
index 6bb5e0b5b11c..000000000000
--- a/www-client/epiphany/files/epiphany-2.26.3-xul192.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- embed/mozilla/EphyXULAppInfo.cpp~ 2009-05-28 21:26:21.000000000 +0200
-+++ embed/mozilla/EphyXULAppInfo.cpp 2010-03-08 23:29:42.000000000 +0100
-@@ -128,3 +128,11 @@
- aXPCOMABI.Assign (EPHY_HOST_CPU "-gcc3");
- return NS_OK;
- }
-+
-+/* readonly attribute AUTF8String WidgetToolkit; */
-+NS_IMETHODIMP
-+EphyXULAppInfo::GetWidgetToolkit(nsACString & aWidgetToolkit)
-+{
-+ aWidgetToolkit.Assign ("gtk");
-+ return NS_OK;
-+}