summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2018-12-12 11:11:16 +0100
committerQuentin Glidic2018-12-12 22:24:19 +0100
commitf9c28e2320d52e0a1e80c8d14b10ee75dfe14dae (patch)
tree4fbf24ff799707f5c2dedc5959b435a0295320fa /packages
parentf5a8ed059dbef8776a57bcec0a20239807db424e (diff)
downloadsardemff7-pending-f9c28e2320d52e0a1e80c8d14b10ee75dfe14dae.tar.xz
mozilla-app: Drop Wayland patches
Mostly upstream now Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/mail-client/daily/files/wayland.patch79
-rw-r--r--packages/net-www/nightly/files/wayland.patch79
-rw-r--r--packages/net-www/nightly/nightly-scm.exheres-01
3 files changed, 0 insertions, 159 deletions
diff --git a/packages/mail-client/daily/files/wayland.patch b/packages/mail-client/daily/files/wayland.patch
deleted file mode 100644
index da171a8..0000000
--- a/packages/mail-client/daily/files/wayland.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index 4ac1d34..eadaa84 100644
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -126,6 +126,7 @@ using namespace mozilla::widget;
- #include "NativeKeyBindings.h"
-
- #include <dlfcn.h>
-+#include <sys/time.h>
-
- #include "mozilla/layers/APZCTreeManager.h"
-
-@@ -290,21 +291,26 @@ namespace mozilla {
- class CurrentX11TimeGetter
- {
- public:
-- explicit CurrentX11TimeGetter(GdkWindow* aWindow)
-+ explicit CurrentX11TimeGetter(GdkWindow* aWindow, bool aIsX11Display)
- : mWindow(aWindow)
-+ , mIsX11Display(aIsX11Display)
- , mAsyncUpdateStart()
- {
- }
-
- guint32 GetCurrentTime() const
- {
-- return gdk_x11_get_server_time(mWindow);
-+ if (mIsX11Display) {
-+ return gdk_x11_get_server_time(mWindow);
-+ } else {
-+ return g_get_monotonic_time()/1000;
-+ }
- }
-
- void GetTimeAsyncForPossibleBackwardsSkew(const TimeStamp& aNow)
- {
- // Check for in-flight request
-- if (!mAsyncUpdateStart.IsNull()) {
-+ if (!mIsX11Display || !mAsyncUpdateStart.IsNull()) {
- return;
- }
- mAsyncUpdateStart = aNow;
-@@ -321,6 +327,9 @@ public:
- gboolean PropertyNotifyHandler(GtkWidget* aWidget,
- GdkEventProperty* aEvent)
- {
-+ if (!mIsX11Display)
-+ return FALSE;
-+
- if (aEvent->atom !=
- gdk_x11_xatom_to_atom(TimeStampPropAtom())) {
- return FALSE;
-@@ -343,6 +352,7 @@ private:
- // This is safe because this class is stored as a member of mWindow and
- // won't outlive it.
- GdkWindow* mWindow;
-+ bool mIsX11Display;
- TimeStamp mAsyncUpdateStart;
- };
-
-@@ -3059,7 +3073,7 @@ mozilla::CurrentX11TimeGetter*
- nsWindow::GetCurrentTimeGetter() {
- MOZ_ASSERT(mGdkWindow, "Expected mGdkWindow to be set");
- if (MOZ_UNLIKELY(!mCurrentTimeGetter)) {
-- mCurrentTimeGetter = MakeUnique<CurrentX11TimeGetter>(mGdkWindow);
-+ mCurrentTimeGetter = MakeUnique<CurrentX11TimeGetter>(mGdkWindow, mIsX11Display);
- }
- return mCurrentTimeGetter.get();
- }
-@@ -3941,7 +3955,8 @@ nsWindow::Create(nsIWidget* aParent,
- // Similarly double buffering is controlled by the window's owning
- // widget. Disable double buffering for painting directly to the
- // X Window.
-- gtk_widget_set_double_buffered(widgets[i], FALSE);
-+ if (mIsX11Display)
-+ gtk_widget_set_double_buffered(widgets[i], FALSE);
- }
-
- // We create input contexts for all containers, except for
diff --git a/packages/net-www/nightly/files/wayland.patch b/packages/net-www/nightly/files/wayland.patch
deleted file mode 100644
index da171a8..0000000
--- a/packages/net-www/nightly/files/wayland.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index 4ac1d34..eadaa84 100644
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -126,6 +126,7 @@ using namespace mozilla::widget;
- #include "NativeKeyBindings.h"
-
- #include <dlfcn.h>
-+#include <sys/time.h>
-
- #include "mozilla/layers/APZCTreeManager.h"
-
-@@ -290,21 +291,26 @@ namespace mozilla {
- class CurrentX11TimeGetter
- {
- public:
-- explicit CurrentX11TimeGetter(GdkWindow* aWindow)
-+ explicit CurrentX11TimeGetter(GdkWindow* aWindow, bool aIsX11Display)
- : mWindow(aWindow)
-+ , mIsX11Display(aIsX11Display)
- , mAsyncUpdateStart()
- {
- }
-
- guint32 GetCurrentTime() const
- {
-- return gdk_x11_get_server_time(mWindow);
-+ if (mIsX11Display) {
-+ return gdk_x11_get_server_time(mWindow);
-+ } else {
-+ return g_get_monotonic_time()/1000;
-+ }
- }
-
- void GetTimeAsyncForPossibleBackwardsSkew(const TimeStamp& aNow)
- {
- // Check for in-flight request
-- if (!mAsyncUpdateStart.IsNull()) {
-+ if (!mIsX11Display || !mAsyncUpdateStart.IsNull()) {
- return;
- }
- mAsyncUpdateStart = aNow;
-@@ -321,6 +327,9 @@ public:
- gboolean PropertyNotifyHandler(GtkWidget* aWidget,
- GdkEventProperty* aEvent)
- {
-+ if (!mIsX11Display)
-+ return FALSE;
-+
- if (aEvent->atom !=
- gdk_x11_xatom_to_atom(TimeStampPropAtom())) {
- return FALSE;
-@@ -343,6 +352,7 @@ private:
- // This is safe because this class is stored as a member of mWindow and
- // won't outlive it.
- GdkWindow* mWindow;
-+ bool mIsX11Display;
- TimeStamp mAsyncUpdateStart;
- };
-
-@@ -3059,7 +3073,7 @@ mozilla::CurrentX11TimeGetter*
- nsWindow::GetCurrentTimeGetter() {
- MOZ_ASSERT(mGdkWindow, "Expected mGdkWindow to be set");
- if (MOZ_UNLIKELY(!mCurrentTimeGetter)) {
-- mCurrentTimeGetter = MakeUnique<CurrentX11TimeGetter>(mGdkWindow);
-+ mCurrentTimeGetter = MakeUnique<CurrentX11TimeGetter>(mGdkWindow, mIsX11Display);
- }
- return mCurrentTimeGetter.get();
- }
-@@ -3941,7 +3955,8 @@ nsWindow::Create(nsIWidget* aParent,
- // Similarly double buffering is controlled by the window's owning
- // widget. Disable double buffering for painting directly to the
- // X Window.
-- gtk_widget_set_double_buffered(widgets[i], FALSE);
-+ if (mIsX11Display)
-+ gtk_widget_set_double_buffered(widgets[i], FALSE);
- }
-
- // We create input contexts for all containers, except for
diff --git a/packages/net-www/nightly/nightly-scm.exheres-0 b/packages/net-www/nightly/nightly-scm.exheres-0
index 97b96bc..6982e34 100644
--- a/packages/net-www/nightly/nightly-scm.exheres-0
+++ b/packages/net-www/nightly/nightly-scm.exheres-0
@@ -9,7 +9,6 @@ HOMEPAGE="http://www.mozilla.com/en-US/firefox"
PLATFORMS="~amd64"
DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/wayland.patch
"${FILES}"/gtk2less.patch
)