mozilla-app: GTK2 plugin support removed upstream

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>

5 files changed, 0 insertions, 334 deletions

diff --git a/exlibs/mozilla-app.exlib b/exlibs/mozilla-app.exlib
index 3442e27..e9ca3a4 100644
--- a/exlibs/mozilla-app.exlib
+++ b/exlibs/mozilla-app.exlib
@@ -54,7 +54,6 @@ MYOPTIONS="
     wayland
     wifi
     ( providers: jpeg-turbo [[ description = [ Build with system jpeg ] ]] )
-    gtk2-plugin-support [[ description = [ Build a libmozgtk to support GTK+ 2 plugins ] ]]
 "
 if exparam -b comm; then
     MYOPTIONS+="
@@ -93,7 +92,6 @@ DEPENDENCIES="
         x11-libs/pixman
 
         dbus? ( dev-libs/dbus-glib[>=0.72] )
-        gtk2-plugin-support? ( x11-libs/gtk+:2[>=2.14.0] )
         providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
         wifi? ( net-wireless/wireless_tools )
     recommendation:
@@ -145,25 +143,6 @@ if ever is_scm; then
     mozilla-app_src_prepare() {
         default
 
-        if exparam -b comm; then
-            if option !gtk2-plugin-support; then
-                edo sed -i \
-                    -e '\|/gtk2/|d' \
-                    comm/mail/installer/package-manifest.in
-            fi
-        fi
-
-        if option !gtk2-plugin-support; then
-            edo sed -i \
-                -e '/MOZ_GTK2_CFLAGS=/d' \
-                -e '/PKG_CHECK_MODULES(MOZ_GTK2/i\MOZ_GTK2_CFLAGS=${MOZ_GTK3_CFLAGS}' \
-                -e '/PKG_CHECK_MODULES(MOZ_GTK2/i\MOZ_GTK2_LIBS=${MOZ_GTK3_LIBS}' \
-                -e '/PKG_CHECK_MODULES(MOZ_GTK2/i\AC_SUBST_LIST([MOZ_GTK2_CFLAGS])' \
-                -e '/PKG_CHECK_MODULES(MOZ_GTK2/i\AC_SUBST_LIST([MOZ_GTK2_LIBS])' \
-                -e '/PKG_CHECK_MODULES(MOZ_GTK2/d' \
-                old-configure.in
-        fi
-
         mozilla-scm_patch_baseconfig
 
         # Force symbols file to be regenerated
diff --git a/packages/mail-client/daily/daily-scm.exheres-0 b/packages/mail-client/daily/daily-scm.exheres-0
index f23c9e7..8a7e330 100644
--- a/packages/mail-client/daily/daily-scm.exheres-0
+++ b/packages/mail-client/daily/daily-scm.exheres-0
@@ -10,7 +10,6 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird"
 PLATFORMS="~amd64"
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/gtk2less.patch
     "${FILES}"/bundled-botan-cc-fix.patch
 )
 
diff --git a/packages/mail-client/daily/files/gtk2less.patch b/packages/mail-client/daily/files/gtk2less.patch
deleted file mode 100644
index 0042d5f..0000000
--- a/packages/mail-client/daily/files/gtk2less.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From e1064b52ff109da23dbc4d02aee75a30d431f6e2 Mon Sep 17 00:00:00 2001
-From: Quentin Glidic <sardemff7+git@sardemff7.net>
-Date: Wed, 12 Dec 2018 21:47:34 +0100
-Subject: [PATCH] Less GTK+2
-
-Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
----
- browser/installer/package-manifest.in   |  1 -
- dom/plugins/ipc/PluginInstanceChild.cpp |  6 +++---
- dom/plugins/ipc/PluginModuleChild.cpp   | 12 ++++++------
- dom/plugins/ipc/PluginModuleChild.h     |  2 +-
- old-configure.in                        |  1 -
- widget/gtk/mozgtk/moz.build             |  2 +-
- 6 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index ec20499166e8..624855202842 100644
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -107,7 +107,6 @@
- #endif
- #ifdef MOZ_GTK
- @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
--@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
- #ifdef MOZ_WAYLAND
- @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
- #endif
-diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
-index 58d809297fb2..c2d3d07043f7 100644
---- a/dom/plugins/ipc/PluginInstanceChild.cpp
-+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
-@@ -45,7 +45,7 @@ using namespace mozilla::layers;
- using namespace mozilla::gfx;
- using namespace mozilla::widget;
- 
--#ifdef MOZ_WIDGET_GTK
-+#if 0 && defined(MOZ_WIDGET_GTK)
- 
- #  include <gtk/gtk.h>
- #  include <gdk/gdkx.h>
-@@ -185,7 +185,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
- #if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX)
-   mWindow.ws_info = &mWsInfo;
-   memset(&mWsInfo, 0, sizeof(mWsInfo));
--#  ifdef MOZ_WIDGET_GTK
-+#  if 0 && defined(MOZ_WIDGET_GTK)
-   mWsInfo.display = nullptr;
- #  else
-   mWsInfo.display = DefaultXDisplay();
-@@ -1251,7 +1251,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_SetWindow(
- }
- 
- bool PluginInstanceChild::Initialize() {
--#if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-   if (mWsInfo.display) {
-     // Already initialized
-     return true;
-diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
-index 81eb8467d468..13dc3acf074d 100644
---- a/dom/plugins/ipc/PluginModuleChild.cpp
-+++ b/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -12,7 +12,7 @@
- 
- #include "mozilla/ipc/MessageChannel.h"
- 
--#ifdef MOZ_WIDGET_GTK
-+#if 0 && defined(MOZ_WIDGET_GTK)
- #  include <gtk/gtk.h>
- #  include <gdk/gdkx.h>
- #endif
-@@ -101,7 +101,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
- #if defined(OS_WIN) || defined(OS_MACOSX)
-       ,
-       mGetEntryPointsFunc(0)
--#elif defined(MOZ_WIDGET_GTK)
-+#elif 0 && defined(MOZ_WIDGET_GTK)
-       ,
-       mNestedLoopTimerId(0)
- #endif
-@@ -331,7 +331,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
-   return true;
- }
- 
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
- 
- typedef void (*GObjectDisposeFn)(GObject*);
- typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*);
-@@ -551,7 +551,7 @@ bool PluginModuleChild::ShouldContinueFromReplyTimeout() {
- }
- 
- bool PluginModuleChild::InitGraphics() {
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-   // Work around plugins that don't interact well with GDK
-   // client-side windows.
-   PR_SetEnv("GDK_NATIVE_WINDOWS=1");
-@@ -995,7 +995,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
-   switch (aVariable) {
-     // Copied from nsNPAPIPlugin.cpp
-     case NPNVToolkit:
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-       *static_cast<NPNToolkitType*>(aValue) = NPNVGtk2;
-       return NPERR_NO_ERROR;
- #endif
-@@ -1021,7 +1021,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
-     case NPNVSupportsWindowless:
-       *(NPBool*)aValue = true;
-       return NPERR_NO_ERROR;
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-     case NPNVxDisplay: {
-       if (!aNPP) {
-         return NPERR_INVALID_INSTANCE_ERROR;
-diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h
-index 31d4eafb8fb7..64fdaa0fd28d 100644
---- a/dom/plugins/ipc/PluginModuleChild.h
-+++ b/dom/plugins/ipc/PluginModuleChild.h
-@@ -210,7 +210,7 @@ class PluginModuleChild : public PPluginModuleChild {
-   bool InitGraphics();
-   void DeinitGraphics();
- 
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-   static gboolean DetectNestedEventLoop(gpointer data);
-   static gboolean ProcessBrowserEvents(gpointer data);
- 
-diff --git a/old-configure.in b/old-configure.in
-index 0ac86af0c8c7..8c3705150872 100644
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -53,7 +53,6 @@ GLIB_VERSION=2.42
- GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42
- GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42
- CAIRO_VERSION=1.10
--GTK2_VERSION=2.18.0
- GTK3_VERSION=3.14.0
- GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_14
- W32API_VERSION=3.14
-diff --git a/widget/gtk/mozgtk/moz.build b/widget/gtk/mozgtk/moz.build
-index 828858374534..cca6db0e89ce 100644
---- a/widget/gtk/mozgtk/moz.build
-+++ b/widget/gtk/mozgtk/moz.build
-@@ -4,4 +4,4 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--DIRS += ["stub", "gtk2", "gtk3"]
-+DIRS += ["stub", "gtk3"]
--- 
-2.28.0
-
diff --git a/packages/net-www/nightly/files/gtk2less.patch b/packages/net-www/nightly/files/gtk2less.patch
deleted file mode 100644
index 0042d5f..0000000
--- a/packages/net-www/nightly/files/gtk2less.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From e1064b52ff109da23dbc4d02aee75a30d431f6e2 Mon Sep 17 00:00:00 2001
-From: Quentin Glidic <sardemff7+git@sardemff7.net>
-Date: Wed, 12 Dec 2018 21:47:34 +0100
-Subject: [PATCH] Less GTK+2
-
-Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
----
- browser/installer/package-manifest.in   |  1 -
- dom/plugins/ipc/PluginInstanceChild.cpp |  6 +++---
- dom/plugins/ipc/PluginModuleChild.cpp   | 12 ++++++------
- dom/plugins/ipc/PluginModuleChild.h     |  2 +-
- old-configure.in                        |  1 -
- widget/gtk/mozgtk/moz.build             |  2 +-
- 6 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index ec20499166e8..624855202842 100644
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -107,7 +107,6 @@
- #endif
- #ifdef MOZ_GTK
- @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
--@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
- #ifdef MOZ_WAYLAND
- @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
- #endif
-diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
-index 58d809297fb2..c2d3d07043f7 100644
---- a/dom/plugins/ipc/PluginInstanceChild.cpp
-+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
-@@ -45,7 +45,7 @@ using namespace mozilla::layers;
- using namespace mozilla::gfx;
- using namespace mozilla::widget;
- 
--#ifdef MOZ_WIDGET_GTK
-+#if 0 && defined(MOZ_WIDGET_GTK)
- 
- #  include <gtk/gtk.h>
- #  include <gdk/gdkx.h>
-@@ -185,7 +185,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
- #if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX)
-   mWindow.ws_info = &mWsInfo;
-   memset(&mWsInfo, 0, sizeof(mWsInfo));
--#  ifdef MOZ_WIDGET_GTK
-+#  if 0 && defined(MOZ_WIDGET_GTK)
-   mWsInfo.display = nullptr;
- #  else
-   mWsInfo.display = DefaultXDisplay();
-@@ -1251,7 +1251,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_SetWindow(
- }
- 
- bool PluginInstanceChild::Initialize() {
--#if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-   if (mWsInfo.display) {
-     // Already initialized
-     return true;
-diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
-index 81eb8467d468..13dc3acf074d 100644
---- a/dom/plugins/ipc/PluginModuleChild.cpp
-+++ b/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -12,7 +12,7 @@
- 
- #include "mozilla/ipc/MessageChannel.h"
- 
--#ifdef MOZ_WIDGET_GTK
-+#if 0 && defined(MOZ_WIDGET_GTK)
- #  include <gtk/gtk.h>
- #  include <gdk/gdkx.h>
- #endif
-@@ -101,7 +101,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
- #if defined(OS_WIN) || defined(OS_MACOSX)
-       ,
-       mGetEntryPointsFunc(0)
--#elif defined(MOZ_WIDGET_GTK)
-+#elif 0 && defined(MOZ_WIDGET_GTK)
-       ,
-       mNestedLoopTimerId(0)
- #endif
-@@ -331,7 +331,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
-   return true;
- }
- 
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
- 
- typedef void (*GObjectDisposeFn)(GObject*);
- typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*);
-@@ -551,7 +551,7 @@ bool PluginModuleChild::ShouldContinueFromReplyTimeout() {
- }
- 
- bool PluginModuleChild::InitGraphics() {
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-   // Work around plugins that don't interact well with GDK
-   // client-side windows.
-   PR_SetEnv("GDK_NATIVE_WINDOWS=1");
-@@ -995,7 +995,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
-   switch (aVariable) {
-     // Copied from nsNPAPIPlugin.cpp
-     case NPNVToolkit:
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-       *static_cast<NPNToolkitType*>(aValue) = NPNVGtk2;
-       return NPERR_NO_ERROR;
- #endif
-@@ -1021,7 +1021,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
-     case NPNVSupportsWindowless:
-       *(NPBool*)aValue = true;
-       return NPERR_NO_ERROR;
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-     case NPNVxDisplay: {
-       if (!aNPP) {
-         return NPERR_INVALID_INSTANCE_ERROR;
-diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h
-index 31d4eafb8fb7..64fdaa0fd28d 100644
---- a/dom/plugins/ipc/PluginModuleChild.h
-+++ b/dom/plugins/ipc/PluginModuleChild.h
-@@ -210,7 +210,7 @@ class PluginModuleChild : public PPluginModuleChild {
-   bool InitGraphics();
-   void DeinitGraphics();
- 
--#if defined(MOZ_WIDGET_GTK)
-+#if 0 && defined(MOZ_WIDGET_GTK)
-   static gboolean DetectNestedEventLoop(gpointer data);
-   static gboolean ProcessBrowserEvents(gpointer data);
- 
-diff --git a/old-configure.in b/old-configure.in
-index 0ac86af0c8c7..8c3705150872 100644
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -53,7 +53,6 @@ GLIB_VERSION=2.42
- GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42
- GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42
- CAIRO_VERSION=1.10
--GTK2_VERSION=2.18.0
- GTK3_VERSION=3.14.0
- GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_14
- W32API_VERSION=3.14
-diff --git a/widget/gtk/mozgtk/moz.build b/widget/gtk/mozgtk/moz.build
-index 828858374534..cca6db0e89ce 100644
---- a/widget/gtk/mozgtk/moz.build
-+++ b/widget/gtk/mozgtk/moz.build
-@@ -4,4 +4,4 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--DIRS += ["stub", "gtk2", "gtk3"]
-+DIRS += ["stub", "gtk3"]
--- 
-2.28.0
-
diff --git a/packages/net-www/nightly/nightly-scm.exheres-0 b/packages/net-www/nightly/nightly-scm.exheres-0
index 9b6108b..44fe64c 100644
--- a/packages/net-www/nightly/nightly-scm.exheres-0
+++ b/packages/net-www/nightly/nightly-scm.exheres-0
@@ -8,7 +8,3 @@ HOMEPAGE="http://www.mozilla.com/en-US/firefox"
 
 PLATFORMS="~amd64"
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/gtk2less.patch
-)
-