mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/firefox to 130.0-1
This commit is contained in:
Kevin Mihelich
parent
e47c1eab93
commit
54ce2c44e8
7 changed files with 805 additions and 700 deletions
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = firefox
|
||||
pkgdesc = Fast, Private & Safe Web Browser
|
||||
pkgver = 129.0.2
|
||||
pkgver = 130.0
|
||||
pkgrel = 1
|
||||
url = https://www.mozilla.org/firefox/
|
||||
arch = x86_64
|
||||
|
|
@ -63,33 +63,21 @@ pkgbase = firefox
|
|||
options = !emptydirs
|
||||
options = !lto
|
||||
options = !makeflags
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/129.0.2/source/firefox-129.0.2.source.tar.xz
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/129.0.2/source/firefox-129.0.2.source.tar.xz.asc
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/130.0/source/firefox-130.0.source.tar.xz
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/130.0/source/firefox-130.0.source.tar.xz.asc
|
||||
source = firefox-symbolic.svg
|
||||
source = firefox.desktop
|
||||
source = org.mozilla.firefox.metainfo.xml
|
||||
source = 0001-Bug-1898476-Wayland-Move-MozContainerSurfaceLock-fro.patch
|
||||
source = 0002-Bug-1898476-Wayland-Provide-surface-lock-by-GtkCompo.patch
|
||||
source = 0003-Bug-1898476-Wayland-Lock-Wayland-surface-before-Swap.patch
|
||||
source = 0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch
|
||||
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
sha256sums = 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344
|
||||
sha256sums = 0c12852a502c9ceefc11003416057917466d8788dd8780931ea387b0b137b567
|
||||
sha256sums = SKIP
|
||||
sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
|
||||
sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044
|
||||
sha256sums = 71fe797430198ac8c00b538dce537284cf526e48be0496698cf5a980d70c16da
|
||||
sha256sums = 58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1
|
||||
sha256sums = f4e1db05768325bce5f38b67263c47b3aa4038cfadbdbf8a9e0cbec061a58c57
|
||||
sha256sums = 588b0b94fe188c5f0a133a8bfd88d7d60123315e6f509b119728409ff164419f
|
||||
sha256sums = cbe19f6c95d27d50e3b6664907f8d084784162ea35d5d98fadbb91dbb77ef700
|
||||
sha256sums = dd2aba1c02c21b89ceed0713a6aa0241365fe79b1e3a4d21cdcd7231db6fab5e
|
||||
b2sums = f0c79de337b5c55f9345b21714dd1707e8ca20f66f7ae383026c3737a7a1eeafa5048c188b91cc2ca6089aff944802cf04fcaeed81af7a42218925981c0e5550
|
||||
b2sums = 9c7dfc43145e442d60f6971806848e4ecd0145713e31105da6bd13a82a50655f5c4095beff4d61505e26e188b60f49b16dc17fb42dc03a9fb9ef509a7010b0ab
|
||||
b2sums = SKIP
|
||||
b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
|
||||
b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628
|
||||
b2sums = 2c7936949ef922307fb593bd0480a13bde2eab8ae24fc89071d809d6659384705f9b7838b1ae8bc46b98a152ba01fcffad606d4c84796ad9bfaaf20166f0a0fd
|
||||
b2sums = 2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14
|
||||
b2sums = 2d4c421aec450c85c25554a8f312df8b74bb184e13fdd631ec7b34abbc3e5b1015fdef8d7ee637638c916f8bdd9cecfcb9c2713055471feb863888fd238e288e
|
||||
b2sums = 884183ba979c844a2119dbb28cb1bbe64228b1a1a6b020abea9dfb5bd60487853a1da1012e157b8149f3e89b3d35c76042aa143b28fd55b0120edb03c63f9a81
|
||||
b2sums = b649c5c3edc4a0319d012ff0c12dbc97f3bb244220c9db5334a921864f57e05506943f50ccd7ee832b881ace642ce294892e25eaa555716d2dcc726f4790c605
|
||||
b2sums = eb84ee67ce049351e07cfd02f7bd024fb31e041f839c105e3bc15a904632b6c668bca494aa721f0c092172dc45ad2d576c9f6d45f15877f7189e15ab403a45c5
|
||||
|
||||
pkgname = firefox
|
||||
|
|
|
|||
|
|
@ -1,178 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: stransky <stransky@redhat.com>
|
||||
Date: Wed, 10 Jul 2024 10:59:52 +0000
|
||||
Subject: [PATCH] Bug 1898476 [Wayland] Move MozContainerSurfaceLock from
|
||||
MozContainerWayland to MozContainerSurfaceLock module r=emilio
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D214883
|
||||
---
|
||||
widget/gtk/MozContainerSurfaceLock.cpp | 31 ++++++++++++++++++++++++++
|
||||
widget/gtk/MozContainerSurfaceLock.h | 28 +++++++++++++++++++++++
|
||||
widget/gtk/MozContainerWayland.cpp | 17 --------------
|
||||
widget/gtk/MozContainerWayland.h | 16 ++++++-------
|
||||
widget/gtk/moz.build | 3 +++
|
||||
5 files changed, 69 insertions(+), 26 deletions(-)
|
||||
create mode 100644 widget/gtk/MozContainerSurfaceLock.cpp
|
||||
create mode 100644 widget/gtk/MozContainerSurfaceLock.h
|
||||
|
||||
diff --git a/widget/gtk/MozContainerSurfaceLock.cpp b/widget/gtk/MozContainerSurfaceLock.cpp
|
||||
new file mode 100644
|
||||
index 000000000000..22e6baf0bd82
|
||||
--- /dev/null
|
||||
+++ b/widget/gtk/MozContainerSurfaceLock.cpp
|
||||
@@ -0,0 +1,31 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * 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/. */
|
||||
+
|
||||
+#include "MozContainerSurfaceLock.h"
|
||||
+#include "MozContainer.h"
|
||||
+#include "WidgetUtilsGtk.h"
|
||||
+
|
||||
+using namespace mozilla::widget;
|
||||
+
|
||||
+MozContainerSurfaceLock::MozContainerSurfaceLock(MozContainer* aContainer) {
|
||||
+#ifdef MOZ_WAYLAND
|
||||
+ mContainer = aContainer;
|
||||
+ if (GdkIsWaylandDisplay()) {
|
||||
+ // mSurface can be nullptr if we lock hidden MozContainer and
|
||||
+ // that's correct, MozContainer is still locked.
|
||||
+ mSurface = moz_container_wayland_surface_lock(aContainer);
|
||||
+ }
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+MozContainerSurfaceLock::~MozContainerSurfaceLock() {
|
||||
+#ifdef MOZ_WAYLAND
|
||||
+ if (GdkIsWaylandDisplay()) {
|
||||
+ moz_container_wayland_surface_unlock(mContainer, &mSurface);
|
||||
+ }
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+struct wl_surface* MozContainerSurfaceLock::GetSurface() { return mSurface; }
|
||||
diff --git a/widget/gtk/MozContainerSurfaceLock.h b/widget/gtk/MozContainerSurfaceLock.h
|
||||
new file mode 100644
|
||||
index 000000000000..f96893b3f5b9
|
||||
--- /dev/null
|
||||
+++ b/widget/gtk/MozContainerSurfaceLock.h
|
||||
@@ -0,0 +1,28 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * 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/. */
|
||||
+
|
||||
+#ifndef widget_gtk_MozContainerSurfaceLock_h
|
||||
+#define widget_gtk_MozContainerSurfaceLock_h
|
||||
+
|
||||
+struct wl_surface;
|
||||
+struct _MozContainer;
|
||||
+typedef struct _MozContainer MozContainer;
|
||||
+
|
||||
+class MozContainerSurfaceLock {
|
||||
+ public:
|
||||
+ explicit MozContainerSurfaceLock(MozContainer* aContainer);
|
||||
+ ~MozContainerSurfaceLock();
|
||||
+
|
||||
+ // wl_surface can be nullptr if we lock hidden MozContainer.
|
||||
+ struct wl_surface* GetSurface();
|
||||
+
|
||||
+ private:
|
||||
+#ifdef MOZ_WAYLAND
|
||||
+ MozContainer* mContainer = nullptr;
|
||||
+#endif
|
||||
+ struct wl_surface* mSurface = nullptr;
|
||||
+};
|
||||
+
|
||||
+#endif // widget_gtk_MozContainerSurfaceLock_h
|
||||
diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp
|
||||
index 84c5e0a6642d..47e7cce6927b 100644
|
||||
--- a/widget/gtk/MozContainerWayland.cpp
|
||||
+++ b/widget/gtk/MozContainerWayland.cpp
|
||||
@@ -87,23 +87,6 @@ static void moz_container_wayland_set_opaque_region_locked(
|
||||
const MutexAutoLock& aProofOfLock, MozContainer* container,
|
||||
const LayoutDeviceIntRegion&);
|
||||
|
||||
-// Lock mozcontainer and get wayland surface of it. You need to pair with
|
||||
-// moz_container_wayland_surface_unlock() even
|
||||
-// if moz_container_wayland_surface_lock() fails and returns nullptr.
|
||||
-static struct wl_surface* moz_container_wayland_surface_lock(
|
||||
- MozContainer* container);
|
||||
-static void moz_container_wayland_surface_unlock(MozContainer* container,
|
||||
- struct wl_surface** surface);
|
||||
-
|
||||
-MozContainerSurfaceLock::MozContainerSurfaceLock(MozContainer* aContainer) {
|
||||
- mContainer = aContainer;
|
||||
- mSurface = moz_container_wayland_surface_lock(aContainer);
|
||||
-}
|
||||
-MozContainerSurfaceLock::~MozContainerSurfaceLock() {
|
||||
- moz_container_wayland_surface_unlock(mContainer, &mSurface);
|
||||
-}
|
||||
-struct wl_surface* MozContainerSurfaceLock::GetSurface() { return mSurface; }
|
||||
-
|
||||
// Invalidate gtk wl_surface to commit changes to wl_subsurface.
|
||||
// wl_subsurface changes are effective when parent surface is commited.
|
||||
static void moz_container_wayland_invalidate(MozContainer* container) {
|
||||
diff --git a/widget/gtk/MozContainerWayland.h b/widget/gtk/MozContainerWayland.h
|
||||
index 6a33df264279..6b1b07316955 100644
|
||||
--- a/widget/gtk/MozContainerWayland.h
|
||||
+++ b/widget/gtk/MozContainerWayland.h
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <vector>
|
||||
#include "mozilla/Mutex.h"
|
||||
#include "WindowSurface.h"
|
||||
+#include "MozContainerSurfaceLock.h"
|
||||
|
||||
/*
|
||||
* MozContainer
|
||||
@@ -61,15 +62,12 @@ struct _MozContainerClass;
|
||||
typedef struct _MozContainer MozContainer;
|
||||
typedef struct _MozContainerClass MozContainerClass;
|
||||
|
||||
-class MozContainerSurfaceLock {
|
||||
- MozContainer* mContainer;
|
||||
- struct wl_surface* mSurface;
|
||||
-
|
||||
- public:
|
||||
- explicit MozContainerSurfaceLock(MozContainer* aContainer);
|
||||
- ~MozContainerSurfaceLock();
|
||||
- struct wl_surface* GetSurface();
|
||||
-};
|
||||
+// Lock mozcontainer and get wayland surface of it. You need to pair with
|
||||
+// moz_container_wayland_surface_unlock() even
|
||||
+// if moz_container_wayland_surface_lock() fails and returns nullptr.
|
||||
+struct wl_surface* moz_container_wayland_surface_lock(MozContainer* container);
|
||||
+void moz_container_wayland_surface_unlock(MozContainer* container,
|
||||
+ struct wl_surface** surface);
|
||||
|
||||
void moz_container_wayland_map(GtkWidget*);
|
||||
gboolean moz_container_wayland_map_event(GtkWidget*, GdkEventAny*);
|
||||
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
|
||||
index 1567c006a457..6ced9be06e8f 100644
|
||||
--- a/widget/gtk/moz.build
|
||||
+++ b/widget/gtk/moz.build
|
||||
@@ -33,6 +33,7 @@ if CONFIG["MOZ_ENABLE_V4L2"]:
|
||||
|
||||
EXPORTS += [
|
||||
"MozContainer.h",
|
||||
+ "MozContainerSurfaceLock.h",
|
||||
"nsGTKToolkit.h",
|
||||
"nsGtkUtils.h",
|
||||
"nsImageToPixbuf.h",
|
||||
@@ -71,6 +72,7 @@ UNIFIED_SOURCES += [
|
||||
"IMContextWrapper.cpp",
|
||||
"InProcessGtkCompositorWidget.cpp",
|
||||
"MozContainer.cpp",
|
||||
+ "MozContainerSurfaceLock.cpp",
|
||||
"MPRISServiceHandler.cpp",
|
||||
"NativeKeyBindings.cpp",
|
||||
"NativeMenuGtk.cpp",
|
||||
@@ -114,6 +116,7 @@ if CONFIG["MOZ_WAYLAND"]:
|
||||
"WindowSurfaceWaylandMultiBuffer.cpp",
|
||||
]
|
||||
EXPORTS.mozilla.widget += [
|
||||
+ "MozContainerSurfaceLock.h",
|
||||
"MozContainerWayland.h",
|
||||
"nsWaylandDisplay.h",
|
||||
"WaylandBuffer.h",
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: stransky <stransky@redhat.com>
|
||||
Date: Wed, 10 Jul 2024 10:59:53 +0000
|
||||
Subject: [PATCH] Bug 1898476 [Wayland] Provide surface lock by
|
||||
GtkCompositorWidget r=emilio
|
||||
|
||||
Depends on D214883
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D214884
|
||||
---
|
||||
widget/gtk/GtkCompositorWidget.cpp | 4 ++++
|
||||
widget/gtk/GtkCompositorWidget.h | 4 ++++
|
||||
widget/gtk/nsWindow.cpp | 7 +++++++
|
||||
widget/gtk/nsWindow.h | 3 +++
|
||||
4 files changed, 18 insertions(+)
|
||||
|
||||
diff --git a/widget/gtk/GtkCompositorWidget.cpp b/widget/gtk/GtkCompositorWidget.cpp
|
||||
index 50eb90a0c860..65b9dd3f49e0 100644
|
||||
--- a/widget/gtk/GtkCompositorWidget.cpp
|
||||
+++ b/widget/gtk/GtkCompositorWidget.cpp
|
||||
@@ -211,5 +211,9 @@ bool GtkCompositorWidget::IsPopup() {
|
||||
}
|
||||
#endif
|
||||
|
||||
+UniquePtr<MozContainerSurfaceLock> GtkCompositorWidget::LockSurface() {
|
||||
+ return mWidget->LockSurface();
|
||||
+}
|
||||
+
|
||||
} // namespace widget
|
||||
} // namespace mozilla
|
||||
diff --git a/widget/gtk/GtkCompositorWidget.h b/widget/gtk/GtkCompositorWidget.h
|
||||
index d4834247f16d..8d56f35a561c 100644
|
||||
--- a/widget/gtk/GtkCompositorWidget.h
|
||||
+++ b/widget/gtk/GtkCompositorWidget.h
|
||||
@@ -10,6 +10,8 @@
|
||||
#include "mozilla/DataMutex.h"
|
||||
#include "mozilla/widget/CompositorWidget.h"
|
||||
#include "WindowSurfaceProvider.h"
|
||||
+#include "mozilla/UniquePtr.h"
|
||||
+#include "MozContainerSurfaceLock.h"
|
||||
|
||||
class nsIWidget;
|
||||
class nsWindow;
|
||||
@@ -96,6 +98,8 @@ class GtkCompositorWidget : public CompositorWidget,
|
||||
void NotifyClientSizeChanged(const LayoutDeviceIntSize& aClientSize) override;
|
||||
GtkCompositorWidget* AsGtkCompositorWidget() override { return this; }
|
||||
|
||||
+ UniquePtr<MozContainerSurfaceLock> LockSurface();
|
||||
+
|
||||
private:
|
||||
#if defined(MOZ_WAYLAND)
|
||||
void ConfigureWaylandBackend();
|
||||
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
|
||||
index b78ad4ca286b..40594a0e6f2f 100644
|
||||
--- a/widget/gtk/nsWindow.cpp
|
||||
+++ b/widget/gtk/nsWindow.cpp
|
||||
@@ -10276,3 +10276,10 @@ void nsWindow::SetDragSource(GdkDragContext* aSourceDragContext) {
|
||||
}
|
||||
}
|
||||
}
|
||||
+
|
||||
+UniquePtr<MozContainerSurfaceLock> nsWindow::LockSurface() {
|
||||
+ if (mIsDestroyed) {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+ return MakeUnique<MozContainerSurfaceLock>(mContainer);
|
||||
+}
|
||||
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
|
||||
index 36b039cc5e58..ce57689fcc15 100644
|
||||
--- a/widget/gtk/nsWindow.h
|
||||
+++ b/widget/gtk/nsWindow.h
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
#include "CompositorWidget.h"
|
||||
#include "MozContainer.h"
|
||||
+#include "MozContainerSurfaceLock.h"
|
||||
#include "VsyncSource.h"
|
||||
#include "mozilla/EventForwards.h"
|
||||
#include "mozilla/Maybe.h"
|
||||
@@ -421,6 +422,8 @@ class nsWindow final : public nsBaseWidget {
|
||||
|
||||
static nsWindow* GetFocusedWindow();
|
||||
|
||||
+ mozilla::UniquePtr<MozContainerSurfaceLock> LockSurface();
|
||||
+
|
||||
#ifdef MOZ_WAYLAND
|
||||
// Use xdg-activation protocol to transfer focus from gFocusWindow to aWindow.
|
||||
static void TransferFocusToWaylandWindow(nsWindow* aWindow);
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: stransky <stransky@redhat.com>
|
||||
Date: Wed, 10 Jul 2024 10:59:53 +0000
|
||||
Subject: [PATCH] Bug 1898476 [Wayland] Lock Wayland surface before Swap
|
||||
buffers in RenderCompositorEGL r=emilio
|
||||
|
||||
Depends on D214884
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D214885
|
||||
---
|
||||
gfx/webrender_bindings/RenderCompositorEGL.cpp | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/gfx/webrender_bindings/RenderCompositorEGL.cpp b/gfx/webrender_bindings/RenderCompositorEGL.cpp
|
||||
index ccabfd375f37..ba10c40657d9 100644
|
||||
--- a/gfx/webrender_bindings/RenderCompositorEGL.cpp
|
||||
+++ b/gfx/webrender_bindings/RenderCompositorEGL.cpp
|
||||
@@ -154,6 +154,16 @@ RenderedFrameId RenderCompositorEGL::EndFrame(
|
||||
}
|
||||
gl()->SetDamage(bufferInvalid);
|
||||
}
|
||||
+
|
||||
+#ifdef MOZ_WIDGET_GTK
|
||||
+ // Rendering on Wayland has to be atomic (buffer attach + commit) and
|
||||
+ // wayland surface is also used by main thread so lock it before
|
||||
+ // we paint at SwapBuffers().
|
||||
+ UniquePtr<MozContainerSurfaceLock> lock;
|
||||
+ if (auto* gtkWidget = mWidget->AsGTK()) {
|
||||
+ lock = gtkWidget->LockSurface();
|
||||
+ }
|
||||
+#endif
|
||||
gl()->SwapBuffers();
|
||||
return frameId;
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
|
||||
Date: Sun, 11 Aug 2024 15:12:29 +0000
|
||||
Subject: [PATCH] Bug 1912663 - Fix some build issues with cbindgen 0.27.
|
||||
r=firefox-style-system-reviewers,zrhoffman
|
||||
|
||||
It updates serde and syn and they are more strict. In particular, syn 2
|
||||
doesn't parse the rust 2015 syntax where try is not a keyword, and serde
|
||||
rejects duplicate keys.
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D219025
|
||||
---
|
||||
servo/components/style_traits/values.rs | 16 ++++++++--------
|
||||
servo/ports/geckolib/cbindgen.toml | 1 -
|
||||
2 files changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/servo/components/style_traits/values.rs b/servo/components/style_traits/values.rs
|
||||
index 545dd317de14..1128eb9b315e 100644
|
||||
--- a/servo/components/style_traits/values.rs
|
||||
+++ b/servo/components/style_traits/values.rs
|
||||
@@ -388,39 +388,39 @@ impl Separator for Space {
|
||||
where
|
||||
F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
|
||||
{
|
||||
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
||||
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
||||
let mut results = vec![parse_one(input)?];
|
||||
loop {
|
||||
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
||||
- if let Ok(item) = input.try(&mut parse_one) {
|
||||
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
||||
+ if let Ok(item) = input.try_parse(&mut parse_one) {
|
||||
results.push(item);
|
||||
} else {
|
||||
return Ok(results);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Separator for CommaWithSpace {
|
||||
fn separator() -> &'static str {
|
||||
", "
|
||||
}
|
||||
|
||||
fn parse<'i, 't, F, T, E>(
|
||||
input: &mut Parser<'i, 't>,
|
||||
mut parse_one: F,
|
||||
) -> Result<Vec<T>, ParseError<'i, E>>
|
||||
where
|
||||
F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
|
||||
{
|
||||
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
||||
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
||||
let mut results = vec![parse_one(input)?];
|
||||
loop {
|
||||
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
||||
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
||||
let comma_location = input.current_source_location();
|
||||
- let comma = input.try(|i| i.expect_comma()).is_ok();
|
||||
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
||||
- if let Ok(item) = input.try(&mut parse_one) {
|
||||
+ let comma = input.try_parse(|i| i.expect_comma()).is_ok();
|
||||
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
||||
+ if let Ok(item) = input.try_parse(&mut parse_one) {
|
||||
results.push(item);
|
||||
} else if comma {
|
||||
return Err(comma_location.new_unexpected_token_error(Token::Comma));
|
||||
diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
|
||||
index d507293e195d..38ff6504d949 100644
|
||||
--- a/servo/ports/geckolib/cbindgen.toml
|
||||
+++ b/servo/ports/geckolib/cbindgen.toml
|
||||
@@ -360,7 +360,6 @@ renaming_overrides_prefixing = true
|
||||
"Keyframe" = "Keyframe"
|
||||
"nsChangeHint" = "nsChangeHint"
|
||||
"ServoElementSnapshotTable" = "ServoElementSnapshotTable"
|
||||
-"Keyframe" = "Keyframe"
|
||||
"ComputedKeyframeValues" = "ComputedKeyframeValues"
|
||||
"OriginFlags" = "OriginFlags"
|
||||
"ServoTraversalFlags" = "ServoTraversalFlags"
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
highmem=1
|
||||
|
||||
pkgname=firefox
|
||||
pkgver=129.0.2
|
||||
pkgver=130.0
|
||||
pkgrel=1
|
||||
pkgdesc="Fast, Private & Safe Web Browser"
|
||||
url="https://www.mozilla.org/firefox/"
|
||||
|
|
@ -84,34 +84,22 @@ source=(
|
|||
$pkgname-symbolic.svg
|
||||
$pkgname.desktop
|
||||
org.mozilla.$pkgname.metainfo.xml
|
||||
0001-Bug-1898476-Wayland-Move-MozContainerSurfaceLock-fro.patch
|
||||
0002-Bug-1898476-Wayland-Provide-surface-lock-by-GtkCompo.patch
|
||||
0003-Bug-1898476-Wayland-Lock-Wayland-surface-before-Swap.patch
|
||||
0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch
|
||||
)
|
||||
validpgpkeys=(
|
||||
# Mozilla Software Releases <release@mozilla.com>
|
||||
# https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/
|
||||
14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
)
|
||||
sha256sums=('35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344'
|
||||
sha256sums=('0c12852a502c9ceefc11003416057917466d8788dd8780931ea387b0b137b567'
|
||||
'SKIP'
|
||||
'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
|
||||
'1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044'
|
||||
'58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1'
|
||||
'f4e1db05768325bce5f38b67263c47b3aa4038cfadbdbf8a9e0cbec061a58c57'
|
||||
'588b0b94fe188c5f0a133a8bfd88d7d60123315e6f509b119728409ff164419f'
|
||||
'cbe19f6c95d27d50e3b6664907f8d084784162ea35d5d98fadbb91dbb77ef700'
|
||||
'dd2aba1c02c21b89ceed0713a6aa0241365fe79b1e3a4d21cdcd7231db6fab5e')
|
||||
b2sums=('f0c79de337b5c55f9345b21714dd1707e8ca20f66f7ae383026c3737a7a1eeafa5048c188b91cc2ca6089aff944802cf04fcaeed81af7a42218925981c0e5550'
|
||||
'71fe797430198ac8c00b538dce537284cf526e48be0496698cf5a980d70c16da'
|
||||
'58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1')
|
||||
b2sums=('9c7dfc43145e442d60f6971806848e4ecd0145713e31105da6bd13a82a50655f5c4095beff4d61505e26e188b60f49b16dc17fb42dc03a9fb9ef509a7010b0ab'
|
||||
'SKIP'
|
||||
'63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
|
||||
'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628'
|
||||
'2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14'
|
||||
'2d4c421aec450c85c25554a8f312df8b74bb184e13fdd631ec7b34abbc3e5b1015fdef8d7ee637638c916f8bdd9cecfcb9c2713055471feb863888fd238e288e'
|
||||
'884183ba979c844a2119dbb28cb1bbe64228b1a1a6b020abea9dfb5bd60487853a1da1012e157b8149f3e89b3d35c76042aa143b28fd55b0120edb03c63f9a81'
|
||||
'b649c5c3edc4a0319d012ff0c12dbc97f3bb244220c9db5334a921864f57e05506943f50ccd7ee832b881ace642ce294892e25eaa555716d2dcc726f4790c605'
|
||||
'eb84ee67ce049351e07cfd02f7bd024fb31e041f839c105e3bc15a904632b6c668bca494aa721f0c092172dc45ad2d576c9f6d45f15877f7189e15ab403a45c5')
|
||||
'2c7936949ef922307fb593bd0480a13bde2eab8ae24fc89071d809d6659384705f9b7838b1ae8bc46b98a152ba01fcffad606d4c84796ad9bfaaf20166f0a0fd'
|
||||
'2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14')
|
||||
|
||||
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: These are for Arch Linux use ONLY. For your own distribution, please
|
||||
|
|
@ -124,17 +112,6 @@ prepare() {
|
|||
mkdir mozbuild
|
||||
cd firefox-$pkgver
|
||||
|
||||
# Backport fixes for NVIDIA crashes
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/firefox/-/issues/7
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
|
||||
patch -Np1 -i ../0001-Bug-1898476-Wayland-Move-MozContainerSurfaceLock-fro.patch
|
||||
patch -Np1 -i ../0002-Bug-1898476-Wayland-Provide-surface-lock-by-GtkCompo.patch
|
||||
patch -Np1 -i ../0003-Bug-1898476-Wayland-Lock-Wayland-surface-before-Swap.patch
|
||||
|
||||
# Fix build with cinbdgen 0.27.0
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
|
||||
patch -Np1 -i ../0004-Bug-1912663-Fix-some-build-issues-with-cbindgen-0.27.patch
|
||||
|
||||
echo -n "$_google_api_key" >google-api-key
|
||||
|
||||
cat >.mozconfig <<END
|
||||
|
|
@ -246,6 +223,10 @@ pref("extensions.autoDisableScopes", 11);
|
|||
|
||||
// Enable GNOME Shell search provider
|
||||
pref("browser.gnome-search-provider.enabled", true);
|
||||
|
||||
// Use our own captive portal detection
|
||||
pref("captivedetect.canonicalURL", "http://ping.archlinux.org/nm-check.txt");
|
||||
pref("captivedetect.canonicalContent", "NetworkManager is online\\n");
|
||||
END
|
||||
|
||||
local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue