summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2016-07-18 15:01:09 +0200
committerQuentin Glidic2016-07-18 15:01:09 +0200
commitce6460a35b7490be92b7dc2ae06d5169726f1a73 (patch)
tree3c2bc0c7a5d82b55c12d897dd92affe2986d7d08 /packages
parenta53bdc50876722517401152906cdba4704fe4ee0 (diff)
downloadsardemff7-pending-ce6460a35b7490be92b7dc2ae06d5169726f1a73.tar.xz
mozilla-app: Update GTK+2-less patches
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/mail-client/daily/files/gtk2less.patch72
-rw-r--r--packages/net-www/nightly/files/gtk2less.patch72
2 files changed, 90 insertions, 54 deletions
diff --git a/packages/mail-client/daily/files/gtk2less.patch b/packages/mail-client/daily/files/gtk2less.patch
index 80f8cf1..15b58a2 100644
--- a/packages/mail-client/daily/files/gtk2less.patch
+++ b/packages/mail-client/daily/files/gtk2less.patch
@@ -1,5 +1,17 @@
+From 1e37521bf1b7603bb0b03a1d8fc8e20a237e2417 Mon Sep 17 00:00:00 2001
+From: Quentin Glidic <sardemff7+git@sardemff7.net>
+Date: Mon, 18 Jul 2016 13:32:15 +0200
+Subject: [PATCH] Less GKT+2
+
+Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
+---
+ dom/plugins/ipc/PluginInstanceChild.cpp | 20 ++++++++++----------
+ dom/plugins/ipc/PluginInstanceChild.h | 4 ++--
+ dom/plugins/ipc/PluginModuleChild.cpp | 25 +++++++++++++++++++------
+ 3 files changed, 31 insertions(+), 18 deletions(-)
+
diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
-index a6ed968b..413e52d 100644
+index cacb087..bfe7a46 100644
--- a/mozilla/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/mozilla/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -47,7 +47,7 @@ using namespace mozilla::gfx;
@@ -11,7 +23,7 @@ index a6ed968b..413e52d 100644
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-@@ -156,9 +156,9 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
+@@ -151,9 +151,9 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
, mAsyncInvalidateTask(0)
, mCachedWindowActor(nullptr)
, mCachedElementActor(nullptr)
@@ -23,7 +35,7 @@ index a6ed968b..413e52d 100644
#if defined(OS_WIN)
, mPluginWindowHWND(0)
, mPluginWndProc(0)
-@@ -205,7 +205,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
+@@ -200,7 +200,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));
@@ -32,7 +44,7 @@ index a6ed968b..413e52d 100644
mWsInfo.display = nullptr;
mXtClient.top_widget = nullptr;
#else
-@@ -604,7 +604,7 @@ PluginInstanceChild::NPN_SetValue(NPPVariable aVar, void* aValue)
+@@ -599,7 +599,7 @@ PluginInstanceChild::NPN_SetValue(NPPVariable aVar, void* aValue)
return NPERR_GENERIC_ERROR;
NPWindowType newWindowType = windowed ? NPWindowTypeWindow : NPWindowTypeDrawable;
@@ -41,7 +53,7 @@ index a6ed968b..413e52d 100644
if (mWindow.type != newWindowType && mWsInfo.display) {
// plugin type has been changed but we already have a valid display
// so update it for the recent plugin mode
-@@ -1162,7 +1162,7 @@ bool PluginInstanceChild::CreateWindow(const NPRemoteWindow& aWindow)
+@@ -1157,7 +1157,7 @@ bool PluginInstanceChild::CreateWindow(const NPRemoteWindow& aWindow)
aWindow.x, aWindow.y,
aWindow.width, aWindow.height));
@@ -50,7 +62,7 @@ index a6ed968b..413e52d 100644
if (mXEmbed) {
mWindow.window = reinterpret_cast<void*>(aWindow.window);
}
-@@ -1191,7 +1191,7 @@ void PluginInstanceChild::DeleteWindow()
+@@ -1186,7 +1186,7 @@ void PluginInstanceChild::DeleteWindow()
if (!mWindow.window)
return;
@@ -59,7 +71,7 @@ index a6ed968b..413e52d 100644
if (mXtClient.top_widget) {
xt_client_unrealize(&mXtClient);
xt_client_destroy(&mXtClient);
-@@ -1273,7 +1273,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
+@@ -1268,7 +1268,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
CreateWindow(aWindow);
}
@@ -68,7 +80,7 @@ index a6ed968b..413e52d 100644
if (mXEmbed && gtk_check_version(2,18,7) != nullptr) { // older
if (aWindow.type == NPWindowTypeWindow) {
GdkWindow* socket_window = gdk_window_lookup(static_cast<GdkNativeWindow>(aWindow.window));
-@@ -1402,7 +1402,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
+@@ -1395,7 +1395,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
bool
PluginInstanceChild::Initialize()
{
@@ -77,7 +89,7 @@ index a6ed968b..413e52d 100644
NPError rv;
if (mWsInfo.display) {
-@@ -4609,7 +4609,7 @@ PluginInstanceChild::Destroy()
+@@ -4600,7 +4600,7 @@ PluginInstanceChild::Destroy()
mPendingAsyncCalls.Clear();
@@ -87,7 +99,7 @@ index a6ed968b..413e52d 100644
xt_client_xloop_destroy();
}
diff --git a/dom/plugins/ipc/PluginInstanceChild.h b/dom/plugins/ipc/PluginInstanceChild.h
-index cdeffc0..fa058b2 100644
+index cdeffc0..e82732d 100644
--- a/mozilla/dom/plugins/ipc/PluginInstanceChild.h
+++ b/mozilla/dom/plugins/ipc/PluginInstanceChild.h
@@ -35,7 +35,7 @@
@@ -109,10 +121,10 @@ index cdeffc0..fa058b2 100644
XtClient mXtClient;
#endif
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
-index ddd5f65..5826ef3 100644
+index 27bbd60..83b0821 100644
--- a/mozilla/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/mozilla/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -17,7 +17,7 @@
+@@ -11,7 +11,7 @@
#include "mozilla/ipc/MessageChannel.h"
@@ -121,21 +133,23 @@ index ddd5f65..5826ef3 100644
#include <gtk/gtk.h>
#endif
-@@ -129,7 +129,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
+@@ -117,7 +117,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
, mInitializeFunc(0)
#if defined(OS_WIN) || defined(OS_MACOSX)
, mGetEntryPointsFunc(0)
-#elif defined(MOZ_WIDGET_GTK)
-+#elif defined(MOZ_WIDGET_GTK2)
++#elif (MOZ_WIDGET_GTK == 2)
, mNestedLoopTimerId(0)
- #elif defined(MOZ_WIDGET_QT)
- , mNestedLoopTimerObject(0)
-@@ -333,7 +333,18 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
+ #endif
+ #ifdef OS_WIN
+@@ -310,7 +310,20 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
return true;
}
+-#if defined(MOZ_WIDGET_GTK)
++
++#if (MOZ_WIDGET_GTK == 3)
+
- #if defined(MOZ_WIDGET_GTK)
+void
+PluginModuleChild::EnteredCxxStack()
+{
@@ -145,34 +159,38 @@ index ddd5f65..5826ef3 100644
+PluginModuleChild::ExitedCxxStack()
+{
+}
-+#elif defined(MOZ_WIDGET_GTK2)
++
++#elif (MOZ_WIDGET_GTK == 2)
+
typedef void (*GObjectDisposeFn)(GObject*);
typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*);
- typedef void (*GtkPlugEmbeddedFn)(GtkPlug*);
-@@ -601,7 +612,7 @@ PluginModuleChild::ShouldContinueFromReplyTimeout()
+@@ -559,7 +572,7 @@ PluginModuleChild::ShouldContinueFromReplyTimeout()
bool
PluginModuleChild::InitGraphics()
{
-#if defined(MOZ_WIDGET_GTK)
-+#if defined(MOZ_WIDGET_GTK2)
++#if (MOZ_WIDGET_GTK == 2)
// Work around plugins that don't interact well with GDK
// client-side windows.
PR_SetEnv("GDK_NATIVE_WINDOWS=1");
-@@ -1158,7 +1169,7 @@ _getvalue(NPP aNPP,
+@@ -1094,7 +1107,7 @@ _getvalue(NPP aNPP,
switch (aVariable) {
// Copied from nsNPAPIPlugin.cpp
case NPNVToolkit:
--#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
-+#if defined(MOZ_WIDGET_GTK2) || defined(MOZ_WIDGET_QT)
+-#if defined(MOZ_WIDGET_GTK)
++#if (MOZ_WIDGET_GTK == 2)
*static_cast<NPNToolkitType*>(aValue) = NPNVGtk2;
return NPERR_NO_ERROR;
#endif
-@@ -1179,7 +1190,7 @@ _getvalue(NPP aNPP,
+@@ -1115,7 +1128,7 @@ _getvalue(NPP aNPP,
case NPNVSupportsWindowless:
*(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().supportsWindowless();
return NPERR_NO_ERROR;
-#if defined(MOZ_WIDGET_GTK)
-+#if defined(MOZ_WIDGET_GTK2)
++#if (MOZ_WIDGET_GTK == 2)
case NPNVxDisplay: {
if (aNPP) {
return InstCast(aNPP)->NPN_GetValue(aVariable, aValue);
+--
+2.9.0
+
diff --git a/packages/net-www/nightly/files/gtk2less.patch b/packages/net-www/nightly/files/gtk2less.patch
index e0b0211..3347b6a 100644
--- a/packages/net-www/nightly/files/gtk2less.patch
+++ b/packages/net-www/nightly/files/gtk2less.patch
@@ -1,5 +1,17 @@
+From 1e37521bf1b7603bb0b03a1d8fc8e20a237e2417 Mon Sep 17 00:00:00 2001
+From: Quentin Glidic <sardemff7+git@sardemff7.net>
+Date: Mon, 18 Jul 2016 13:32:15 +0200
+Subject: [PATCH] Less GKT+2
+
+Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
+---
+ dom/plugins/ipc/PluginInstanceChild.cpp | 20 ++++++++++----------
+ dom/plugins/ipc/PluginInstanceChild.h | 4 ++--
+ dom/plugins/ipc/PluginModuleChild.cpp | 25 +++++++++++++++++++------
+ 3 files changed, 31 insertions(+), 18 deletions(-)
+
diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
-index a6ed968b..413e52d 100644
+index cacb087..bfe7a46 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -47,7 +47,7 @@ using namespace mozilla::gfx;
@@ -11,7 +23,7 @@ index a6ed968b..413e52d 100644
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-@@ -156,9 +156,9 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
+@@ -151,9 +151,9 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
, mAsyncInvalidateTask(0)
, mCachedWindowActor(nullptr)
, mCachedElementActor(nullptr)
@@ -23,7 +35,7 @@ index a6ed968b..413e52d 100644
#if defined(OS_WIN)
, mPluginWindowHWND(0)
, mPluginWndProc(0)
-@@ -205,7 +205,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
+@@ -200,7 +200,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));
@@ -32,7 +44,7 @@ index a6ed968b..413e52d 100644
mWsInfo.display = nullptr;
mXtClient.top_widget = nullptr;
#else
-@@ -604,7 +604,7 @@ PluginInstanceChild::NPN_SetValue(NPPVariable aVar, void* aValue)
+@@ -599,7 +599,7 @@ PluginInstanceChild::NPN_SetValue(NPPVariable aVar, void* aValue)
return NPERR_GENERIC_ERROR;
NPWindowType newWindowType = windowed ? NPWindowTypeWindow : NPWindowTypeDrawable;
@@ -41,7 +53,7 @@ index a6ed968b..413e52d 100644
if (mWindow.type != newWindowType && mWsInfo.display) {
// plugin type has been changed but we already have a valid display
// so update it for the recent plugin mode
-@@ -1162,7 +1162,7 @@ bool PluginInstanceChild::CreateWindow(const NPRemoteWindow& aWindow)
+@@ -1157,7 +1157,7 @@ bool PluginInstanceChild::CreateWindow(const NPRemoteWindow& aWindow)
aWindow.x, aWindow.y,
aWindow.width, aWindow.height));
@@ -50,7 +62,7 @@ index a6ed968b..413e52d 100644
if (mXEmbed) {
mWindow.window = reinterpret_cast<void*>(aWindow.window);
}
-@@ -1191,7 +1191,7 @@ void PluginInstanceChild::DeleteWindow()
+@@ -1186,7 +1186,7 @@ void PluginInstanceChild::DeleteWindow()
if (!mWindow.window)
return;
@@ -59,7 +71,7 @@ index a6ed968b..413e52d 100644
if (mXtClient.top_widget) {
xt_client_unrealize(&mXtClient);
xt_client_destroy(&mXtClient);
-@@ -1273,7 +1273,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
+@@ -1268,7 +1268,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
CreateWindow(aWindow);
}
@@ -68,7 +80,7 @@ index a6ed968b..413e52d 100644
if (mXEmbed && gtk_check_version(2,18,7) != nullptr) { // older
if (aWindow.type == NPWindowTypeWindow) {
GdkWindow* socket_window = gdk_window_lookup(static_cast<GdkNativeWindow>(aWindow.window));
-@@ -1402,7 +1402,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
+@@ -1395,7 +1395,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
bool
PluginInstanceChild::Initialize()
{
@@ -77,7 +89,7 @@ index a6ed968b..413e52d 100644
NPError rv;
if (mWsInfo.display) {
-@@ -4609,7 +4609,7 @@ PluginInstanceChild::Destroy()
+@@ -4600,7 +4600,7 @@ PluginInstanceChild::Destroy()
mPendingAsyncCalls.Clear();
@@ -87,7 +99,7 @@ index a6ed968b..413e52d 100644
xt_client_xloop_destroy();
}
diff --git a/dom/plugins/ipc/PluginInstanceChild.h b/dom/plugins/ipc/PluginInstanceChild.h
-index cdeffc0..fa058b2 100644
+index cdeffc0..e82732d 100644
--- a/dom/plugins/ipc/PluginInstanceChild.h
+++ b/dom/plugins/ipc/PluginInstanceChild.h
@@ -35,7 +35,7 @@
@@ -109,10 +121,10 @@ index cdeffc0..fa058b2 100644
XtClient mXtClient;
#endif
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
-index ddd5f65..5826ef3 100644
+index 27bbd60..83b0821 100644
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -17,7 +17,7 @@
+@@ -11,7 +11,7 @@
#include "mozilla/ipc/MessageChannel.h"
@@ -121,21 +133,23 @@ index ddd5f65..5826ef3 100644
#include <gtk/gtk.h>
#endif
-@@ -129,7 +129,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
+@@ -117,7 +117,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
, mInitializeFunc(0)
#if defined(OS_WIN) || defined(OS_MACOSX)
, mGetEntryPointsFunc(0)
-#elif defined(MOZ_WIDGET_GTK)
-+#elif defined(MOZ_WIDGET_GTK2)
++#elif (MOZ_WIDGET_GTK == 2)
, mNestedLoopTimerId(0)
- #elif defined(MOZ_WIDGET_QT)
- , mNestedLoopTimerObject(0)
-@@ -333,7 +333,18 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
+ #endif
+ #ifdef OS_WIN
+@@ -310,7 +310,20 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
return true;
}
+-#if defined(MOZ_WIDGET_GTK)
++
++#if (MOZ_WIDGET_GTK == 3)
+
- #if defined(MOZ_WIDGET_GTK)
+void
+PluginModuleChild::EnteredCxxStack()
+{
@@ -145,34 +159,38 @@ index ddd5f65..5826ef3 100644
+PluginModuleChild::ExitedCxxStack()
+{
+}
-+#elif defined(MOZ_WIDGET_GTK2)
++
++#elif (MOZ_WIDGET_GTK == 2)
+
typedef void (*GObjectDisposeFn)(GObject*);
typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*);
- typedef void (*GtkPlugEmbeddedFn)(GtkPlug*);
-@@ -601,7 +612,7 @@ PluginModuleChild::ShouldContinueFromReplyTimeout()
+@@ -559,7 +572,7 @@ PluginModuleChild::ShouldContinueFromReplyTimeout()
bool
PluginModuleChild::InitGraphics()
{
-#if defined(MOZ_WIDGET_GTK)
-+#if defined(MOZ_WIDGET_GTK2)
++#if (MOZ_WIDGET_GTK == 2)
// Work around plugins that don't interact well with GDK
// client-side windows.
PR_SetEnv("GDK_NATIVE_WINDOWS=1");
-@@ -1158,7 +1169,7 @@ _getvalue(NPP aNPP,
+@@ -1094,7 +1107,7 @@ _getvalue(NPP aNPP,
switch (aVariable) {
// Copied from nsNPAPIPlugin.cpp
case NPNVToolkit:
--#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
-+#if defined(MOZ_WIDGET_GTK2) || defined(MOZ_WIDGET_QT)
+-#if defined(MOZ_WIDGET_GTK)
++#if (MOZ_WIDGET_GTK == 2)
*static_cast<NPNToolkitType*>(aValue) = NPNVGtk2;
return NPERR_NO_ERROR;
#endif
-@@ -1179,7 +1190,7 @@ _getvalue(NPP aNPP,
+@@ -1115,7 +1128,7 @@ _getvalue(NPP aNPP,
case NPNVSupportsWindowless:
*(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().supportsWindowless();
return NPERR_NO_ERROR;
-#if defined(MOZ_WIDGET_GTK)
-+#if defined(MOZ_WIDGET_GTK2)
++#if (MOZ_WIDGET_GTK == 2)
case NPNVxDisplay: {
if (aNPP) {
return InstCast(aNPP)->NPN_GetValue(aVariable, aValue);
+--
+2.9.0
+