summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2021-02-26 06:48:25 +0100
committerQuentin Glidic2021-02-26 06:48:25 +0100
commit2269c971ae7a5166f286446e439fd583405abd2c (patch)
treed39dcdeee7cc11758de82aade2a2da863a324933 /packages
parent87fad7168348bb7494be070780caa3d6ec2592d4 (diff)
downloadsardemff7-pending-2269c971ae7a5166f286446e439fd583405abd2c.tar.xz
daily: Update GKT2 removal patch
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/mail-client/daily/files/gtk2less.patch74
1 files changed, 55 insertions, 19 deletions
diff --git a/packages/mail-client/daily/files/gtk2less.patch b/packages/mail-client/daily/files/gtk2less.patch
index ad651ef..0042d5f 100644
--- a/packages/mail-client/daily/files/gtk2less.patch
+++ b/packages/mail-client/daily/files/gtk2less.patch
@@ -1,30 +1,44 @@
-From e32d3fd40d23b326223dde534cbe1baa25887af8 Mon Sep 17 00:00:00 2001
+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/PluginInstanceChild.h | 4 ++--
dom/plugins/ipc/PluginModuleChild.cpp | 12 ++++++------
dom/plugins/ipc/PluginModuleChild.h | 2 +-
- 4 files changed, 12 insertions(+), 12 deletions(-)
+ 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 172c08837376..1eba79c27d1f 100644
+index 58d809297fb2..c2d3d07043f7 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
-@@ -46,7 +46,7 @@ using namespace mozilla::gfx;
+@@ -45,7 +45,7 @@ using namespace mozilla::layers;
+ using namespace mozilla::gfx;
using namespace mozilla::widget;
- using namespace std;
-#ifdef MOZ_WIDGET_GTK
+#if 0 && defined(MOZ_WIDGET_GTK)
# include <gtk/gtk.h>
# include <gdk/gdkx.h>
-@@ -194,7 +194,7 @@ PluginInstanceChild::PluginInstanceChild(
+@@ -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));
@@ -33,17 +47,17 @@ index 172c08837376..1eba79c27d1f 100644
mWsInfo.display = nullptr;
# else
mWsInfo.display = DefaultXDisplay();
-@@ -1221,7 +1221,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_SetWindow(
+@@ -1251,7 +1251,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_SetWindow(
}
bool PluginInstanceChild::Initialize() {
--#ifdef MOZ_WIDGET_GTK
+-#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 8753e424ce3f..8451352fc6e0 100644
+index 81eb8467d468..13dc3acf074d 100644
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -12,7 +12,7 @@
@@ -53,9 +67,9 @@ index 8753e424ce3f..8451352fc6e0 100644
-#ifdef MOZ_WIDGET_GTK
+#if 0 && defined(MOZ_WIDGET_GTK)
# include <gtk/gtk.h>
+ # include <gdk/gdkx.h>
#endif
-
-@@ -99,7 +99,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
+@@ -101,7 +101,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
#if defined(OS_WIN) || defined(OS_MACOSX)
,
mGetEntryPointsFunc(0)
@@ -64,7 +78,7 @@ index 8753e424ce3f..8451352fc6e0 100644
,
mNestedLoopTimerId(0)
#endif
-@@ -330,7 +330,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
+@@ -331,7 +331,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
return true;
}
@@ -73,7 +87,7 @@ index 8753e424ce3f..8451352fc6e0 100644
typedef void (*GObjectDisposeFn)(GObject*);
typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*);
-@@ -550,7 +550,7 @@ bool PluginModuleChild::ShouldContinueFromReplyTimeout() {
+@@ -551,7 +551,7 @@ bool PluginModuleChild::ShouldContinueFromReplyTimeout() {
}
bool PluginModuleChild::InitGraphics() {
@@ -82,7 +96,7 @@ index 8753e424ce3f..8451352fc6e0 100644
// Work around plugins that don't interact well with GDK
// client-side windows.
PR_SetEnv("GDK_NATIVE_WINDOWS=1");
-@@ -998,7 +998,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
+@@ -995,7 +995,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
switch (aVariable) {
// Copied from nsNPAPIPlugin.cpp
case NPNVToolkit:
@@ -91,7 +105,7 @@ index 8753e424ce3f..8451352fc6e0 100644
*static_cast<NPNToolkitType*>(aValue) = NPNVGtk2;
return NPERR_NO_ERROR;
#endif
-@@ -1024,7 +1024,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
+@@ -1021,7 +1021,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) {
case NPNVSupportsWindowless:
*(NPBool*)aValue = true;
return NPERR_NO_ERROR;
@@ -101,10 +115,10 @@ index 8753e424ce3f..8451352fc6e0 100644
if (!aNPP) {
return NPERR_INVALID_INSTANCE_ERROR;
diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h
-index e770c97ece87..503f28831da5 100644
+index 31d4eafb8fb7..64fdaa0fd28d 100644
--- a/dom/plugins/ipc/PluginModuleChild.h
+++ b/dom/plugins/ipc/PluginModuleChild.h
-@@ -207,7 +207,7 @@ class PluginModuleChild : public PPluginModuleChild {
+@@ -210,7 +210,7 @@ class PluginModuleChild : public PPluginModuleChild {
bool InitGraphics();
void DeinitGraphics();
@@ -113,6 +127,28 @@ index e770c97ece87..503f28831da5 100644
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.20.1
+2.28.0