[arch-commits] Commit in firefox/trunk (3 files)

[Jan Steffens]

    Date: Monday, February 7, 2022 @ 20:42:35
  Author: heftig
Revision: 436406

97.0-1

Modified:
  firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch

-----------------------------------------------------------------+
 0001-Use-remoting-name-for-GDK-application-names.patch          |    8 +-
 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch |   28 ----------
 PKGBUILD                                                        |    8 +-
 3 files changed, 8 insertions(+), 36 deletions(-)

Modified: 0001-Use-remoting-name-for-GDK-application-names.patch
===================================================================
--- 0001-Use-remoting-name-for-GDK-application-names.patch	2022-02-07 20:24:19 UTC (rev 436405)
+++ 0001-Use-remoting-name-for-GDK-application-names.patch	2022-02-07 20:42:35 UTC (rev 436406)
@@ -9,10 +9,10 @@
  2 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index ec8eb1ff1075..3da127bf1d1d 100644
+index ce001e93821f..3be817c5cbd5 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4323,11 +4323,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4348,11 +4348,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -26,7 +26,7 @@
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 7090bd2ef350..76bda087be72 100644
+index c8bbd9a373f5..a6a2186f20fb 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
 @@ -27,6 +27,8 @@
@@ -38,7 +38,7 @@
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
-@@ -256,13 +258,9 @@ nsresult nsAppShell::Init() {
+@@ -257,13 +259,9 @@ nsresult nsAppShell::Init() {
        // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
        //
        // Only bother doing this for the parent process, since it's the one

Deleted: 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch
===================================================================
--- 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch	2022-02-07 20:24:19 UTC (rev 436405)
+++ 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch	2022-02-07 20:42:35 UTC (rev 436406)
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Daudt <kdaudt at alpinelinux.org>
-Date: Sun, 12 Dec 2021 13:38:48 +0000
-Subject: [PATCH] Bug 1745560 - Add missing stub for wl_proxy_marshal_flags,
- r=stransky
-
-Firefox fails to build against wayland 1.20 because this symbol is missing
-
-Differential Revision: https://phabricator.services.mozilla.com/D133583
----
- widget/gtk/mozwayland/mozwayland.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
-index 7a448e6321e2..1a86468b4f3d 100644
---- a/widget/gtk/mozwayland/mozwayland.c
-+++ b/widget/gtk/mozwayland/mozwayland.c
-@@ -200,3 +200,10 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
- 
- MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
-                                     struct wl_list* other) {}
-+
-+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
-+    struct wl_proxy* proxy, uint32_t opcode,
-+    const struct wl_interface* interface, uint32_t version, uint32_t flags,
-+    ...) {
-+  return NULL;
-+}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-07 20:24:19 UTC (rev 436405)
+++ PKGBUILD	2022-02-07 20:42:35 UTC (rev 436406)
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=96.0.3
+pkgver=97.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
@@ -20,13 +20,13 @@
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_US: Spell checking, American English'
             'xdg-desktop-portal: Screensharing with Wayland')
-options=(!emptydirs !makeflags !strip !lto)
+options=(!emptydirs !makeflags !strip !lto !debug)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop identity-icons-brand.svg)
-sha256sums=('1a741d6fcf20e6833a90169f41d29141ea4610f58b848e06091a683af6304dea'
+sha256sums=('6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28'
             'SKIP'
-            '5ead90994f91bed3231c2661977c69fc276cfbe278a1ab904daa544c9455ff42'
+            '8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01'
             '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>