summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2016-06-05 10:39:20 +0200
committerQuentin Glidic2016-06-05 11:57:20 +0200
commit3aff1aff09a5c2fd145af82c2637cd8278d01577 (patch)
tree5e3eecc197beabe485ac541e49407af2816b70ef /packages
parenta75fa47a0175aaba85af51831c04e7c149578df7 (diff)
downloadsardemff7-pending-3aff1aff09a5c2fd145af82c2637cd8278d01577.tar.xz
mozilla-app: Now fix GTK+2 build
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/mail-client/daily/files/gtk2less.patch24
-rw-r--r--packages/net-www/nightly/files/gtk2less.patch24
2 files changed, 24 insertions, 24 deletions
diff --git a/packages/mail-client/daily/files/gtk2less.patch b/packages/mail-client/daily/files/gtk2less.patch
index 5856ba2..80f8cf1 100644
--- a/packages/mail-client/daily/files/gtk2less.patch
+++ b/packages/mail-client/daily/files/gtk2less.patch
@@ -7,7 +7,7 @@ index a6ed968b..413e52d 100644
using namespace std;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
@@ -16,7 +16,7 @@ index a6ed968b..413e52d 100644
, mCachedWindowActor(nullptr)
, mCachedElementActor(nullptr)
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
, mXEmbed(false)
-#endif // MOZ_WIDGET_GTK
+#endif // MOZ_WIDGET_GTK2
@@ -28,7 +28,7 @@ index a6ed968b..413e52d 100644
mWindow.ws_info = &mWsInfo;
memset(&mWsInfo, 0, sizeof(mWsInfo));
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
mWsInfo.display = nullptr;
mXtClient.top_widget = nullptr;
#else
@@ -37,7 +37,7 @@ index a6ed968b..413e52d 100644
NPWindowType newWindowType = windowed ? NPWindowTypeWindow : NPWindowTypeDrawable;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
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
@@ -46,7 +46,7 @@ index a6ed968b..413e52d 100644
aWindow.width, aWindow.height));
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
if (mXEmbed) {
mWindow.window = reinterpret_cast<void*>(aWindow.window);
}
@@ -55,7 +55,7 @@ index a6ed968b..413e52d 100644
return;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
if (mXtClient.top_widget) {
xt_client_unrealize(&mXtClient);
xt_client_destroy(&mXtClient);
@@ -64,7 +64,7 @@ index a6ed968b..413e52d 100644
}
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
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));
@@ -73,7 +73,7 @@ index a6ed968b..413e52d 100644
PluginInstanceChild::Initialize()
{
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
NPError rv;
if (mWsInfo.display) {
@@ -82,7 +82,7 @@ index a6ed968b..413e52d 100644
mPendingAsyncCalls.Clear();
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
if (mWindow.type == NPWindowTypeWindow && !mXEmbed) {
xt_client_xloop_destroy();
}
@@ -95,7 +95,7 @@ index cdeffc0..fa058b2 100644
#include <map>
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
#include "gtk2xtbin.h"
#endif
@@ -104,7 +104,7 @@ index cdeffc0..fa058b2 100644
#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX)
NPSetWindowCallbackStruct mWsInfo;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
bool mXEmbed;
XtClient mXtClient;
#endif
@@ -117,7 +117,7 @@ index ddd5f65..5826ef3 100644
#include "mozilla/ipc/MessageChannel.h"
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
#include <gtk/gtk.h>
#endif
diff --git a/packages/net-www/nightly/files/gtk2less.patch b/packages/net-www/nightly/files/gtk2less.patch
index 2d1854d..e0b0211 100644
--- a/packages/net-www/nightly/files/gtk2less.patch
+++ b/packages/net-www/nightly/files/gtk2less.patch
@@ -7,7 +7,7 @@ index a6ed968b..413e52d 100644
using namespace std;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
@@ -16,7 +16,7 @@ index a6ed968b..413e52d 100644
, mCachedWindowActor(nullptr)
, mCachedElementActor(nullptr)
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
, mXEmbed(false)
-#endif // MOZ_WIDGET_GTK
+#endif // MOZ_WIDGET_GTK2
@@ -28,7 +28,7 @@ index a6ed968b..413e52d 100644
mWindow.ws_info = &mWsInfo;
memset(&mWsInfo, 0, sizeof(mWsInfo));
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
mWsInfo.display = nullptr;
mXtClient.top_widget = nullptr;
#else
@@ -37,7 +37,7 @@ index a6ed968b..413e52d 100644
NPWindowType newWindowType = windowed ? NPWindowTypeWindow : NPWindowTypeDrawable;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
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
@@ -46,7 +46,7 @@ index a6ed968b..413e52d 100644
aWindow.width, aWindow.height));
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
if (mXEmbed) {
mWindow.window = reinterpret_cast<void*>(aWindow.window);
}
@@ -55,7 +55,7 @@ index a6ed968b..413e52d 100644
return;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
if (mXtClient.top_widget) {
xt_client_unrealize(&mXtClient);
xt_client_destroy(&mXtClient);
@@ -64,7 +64,7 @@ index a6ed968b..413e52d 100644
}
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
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));
@@ -73,7 +73,7 @@ index a6ed968b..413e52d 100644
PluginInstanceChild::Initialize()
{
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
NPError rv;
if (mWsInfo.display) {
@@ -82,7 +82,7 @@ index a6ed968b..413e52d 100644
mPendingAsyncCalls.Clear();
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
if (mWindow.type == NPWindowTypeWindow && !mXEmbed) {
xt_client_xloop_destroy();
}
@@ -95,7 +95,7 @@ index cdeffc0..fa058b2 100644
#include <map>
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
#include "gtk2xtbin.h"
#endif
@@ -104,7 +104,7 @@ index cdeffc0..fa058b2 100644
#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX)
NPSetWindowCallbackStruct mWsInfo;
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
bool mXEmbed;
XtClient mXtClient;
#endif
@@ -117,7 +117,7 @@ index ddd5f65..5826ef3 100644
#include "mozilla/ipc/MessageChannel.h"
-#ifdef MOZ_WIDGET_GTK
-+#ifdef MOZ_WIDGET_GTK2
++#if (MOZ_WIDGET_GTK == 2)
#include <gtk/gtk.h>
#endif