From f3add59c65bafa85286c8ad4c0ceb788fad671d2 Mon Sep 17 00:00:00 2001 From: heftig Date: Tue, 9 May 2023 18:51:35 +0000 Subject: [PATCH] db-move: moved firefox from [testing] to [extra] (x86_64) git-svn-id: file:///srv/repos/svn-packages/svn@477031 eb2447ed-0c53-47e4-bac8-5bc4a241df78 --- ...-Wayland-Don-t-commit-wl_buffer-if-buffer.patch | 81 ----- ...-Use-the-vendored-glean_parser-for-all-of.patch | 0 firefox/repos/extra-x86_64/PKGBUILD | 18 +- firefox/repos/testing-x86_64/PKGBUILD | 268 ---------------- firefox/repos/testing-x86_64/firefox.desktop | 340 --------------------- .../repos/testing-x86_64/identity-icons-brand.svg | 3 - .../14F26682D0916CDD81E37B6D61B7B526D98F0353.asc | 63 ---- firefox/repos/testing-x86_64/upload-symbol-archive | 25 -- 8 files changed, 9 insertions(+), 789 deletions(-) delete mode 100644 firefox/repos/extra-x86_64/0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch rename firefox/repos/{testing-x86_64 => extra-x86_64}/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch (100%) delete mode 100644 firefox/repos/testing-x86_64/PKGBUILD delete mode 100644 firefox/repos/testing-x86_64/firefox.desktop delete mode 100644 firefox/repos/testing-x86_64/identity-icons-brand.svg delete mode 100644 firefox/repos/testing-x86_64/keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc delete mode 100755 firefox/repos/testing-x86_64/upload-symbol-archive diff --git a/firefox/repos/extra-x86_64/0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch b/firefox/repos/extra-x86_64/0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch deleted file mode 100644 index 37333e25361..00000000000 --- a/firefox/repos/extra-x86_64/0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: stransky -Date: Thu, 30 Mar 2023 11:49:53 +0000 -Subject: [PATCH] Bug 1803016 [Wayland] Don't commit wl_buffer if buffer scale - doesn't match its size r=emilio - -Differential Revision: https://phabricator.services.mozilla.com/D173814 ---- - widget/gtk/MozContainerWayland.cpp | 7 +++++++ - widget/gtk/MozContainerWayland.h | 3 +++ - widget/gtk/WindowSurfaceWaylandMultiBuffer.cpp | 17 ++++++++++++++--- - 3 files changed, 24 insertions(+), 3 deletions(-) - -diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp -index 2a4a492077c3..0d9aacc954b7 100644 ---- a/widget/gtk/MozContainerWayland.cpp -+++ b/widget/gtk/MozContainerWayland.cpp -@@ -597,6 +597,13 @@ void moz_container_wayland_set_scale_factor(MozContainer* container) { - } - } - -+bool moz_container_wayland_size_matches_scale_factor_locked( -+ const MutexAutoLock& aProofOfLock, MozContainer* container, int aWidth, -+ int aHeight) { -+ return aWidth % container->wl_container.buffer_scale == 0 && -+ aHeight % container->wl_container.buffer_scale == 0; -+} -+ - static bool moz_container_wayland_surface_create_locked( - const MutexAutoLock& aProofOfLock, MozContainer* container) { - MozContainerWayland* wl_container = &container->wl_container; -diff --git a/widget/gtk/MozContainerWayland.h b/widget/gtk/MozContainerWayland.h -index d3c49baae8ac..369d40a55250 100644 ---- a/widget/gtk/MozContainerWayland.h -+++ b/widget/gtk/MozContainerWayland.h -@@ -85,6 +85,9 @@ bool moz_container_wayland_egl_window_needs_size_update(MozContainer* container, - void moz_container_wayland_set_scale_factor(MozContainer* container); - void moz_container_wayland_set_scale_factor_locked( - const mozilla::MutexAutoLock& aProofOfLock, MozContainer* container); -+bool moz_container_wayland_size_matches_scale_factor_locked( -+ const mozilla::MutexAutoLock& aProofOfLock, MozContainer* container, -+ int aWidth, int aHeight); - - void moz_container_wayland_add_initial_draw_callback_locked( - MozContainer* container, const std::function& initial_draw_cb); -diff --git a/widget/gtk/WindowSurfaceWaylandMultiBuffer.cpp b/widget/gtk/WindowSurfaceWaylandMultiBuffer.cpp -index 85ab1942d9e6..31091f4b9848 100644 ---- a/widget/gtk/WindowSurfaceWaylandMultiBuffer.cpp -+++ b/widget/gtk/WindowSurfaceWaylandMultiBuffer.cpp -@@ -285,8 +285,8 @@ void WindowSurfaceWaylandMB::Commit( - mFrameInProcess = false; - - MozContainer* container = mWindow->GetMozContainer(); -- MozContainerSurfaceLock lock(container); -- struct wl_surface* waylandSurface = lock.GetSurface(); -+ MozContainerSurfaceLock MozContainerLock(container); -+ struct wl_surface* waylandSurface = MozContainerLock.GetSurface(); - if (!waylandSurface) { - LOGWAYLAND( - "WindowSurfaceWaylandMB::Commit [%p] frame queued: can't lock " -@@ -319,8 +319,19 @@ void WindowSurfaceWaylandMB::Commit( - } - } - -+ // aProofOfLock is a kind of substitution of MozContainerSurfaceLock. -+ // MozContainer is locked but MozContainerSurfaceLock doen't convert to -+ // MutexAutoLock& so we use aProofOfLock here. - moz_container_wayland_set_scale_factor_locked(aProofOfLock, container); -- mInProgressBuffer->AttachAndCommit(waylandSurface); -+ -+ // It's possible that scale factor changed between Lock() and Commit() -+ // but window size is the same. -+ // Don't attach such buffer as it may have incorrect size, -+ // we'll paint new content soon. -+ if (moz_container_wayland_size_matches_scale_factor_locked( -+ aProofOfLock, container, mWindowSize.width, mWindowSize.height)) { -+ mInProgressBuffer->AttachAndCommit(waylandSurface); -+ } - - mInProgressBuffer->ResetBufferAge(); - mFrontBuffer = mInProgressBuffer; diff --git a/firefox/repos/testing-x86_64/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/firefox/repos/extra-x86_64/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch similarity index 100% rename from firefox/repos/testing-x86_64/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch rename to firefox/repos/extra-x86_64/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch diff --git a/firefox/repos/extra-x86_64/PKGBUILD b/firefox/repos/extra-x86_64/PKGBUILD index d9517e4dd3d..a6bbb941c6d 100644 --- a/firefox/repos/extra-x86_64/PKGBUILD +++ b/firefox/repos/extra-x86_64/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Schmidtke pkgname=firefox -pkgver=112.0.2 -pkgrel=2 +pkgver=113.0 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" url="https://www.mozilla.org/firefox/" arch=(x86_64) @@ -66,21 +66,21 @@ source=( https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} $pkgname.desktop identity-icons-brand.svg - 0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch + 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch ) validpgpkeys=( '14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases ) -sha256sums=('e6a4819a3b82b1ca6c45296e50e6c9ab653306eeb540e50ba8683e339565992e' +sha256sums=('7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627' 'SKIP' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' - 'bfe15651a99ac6d0037867c9db00a0d4340353cdc0ac4a39e43ad61cc2589ed6') -b2sums=('44f2fae6c7260a1a6cad24ee31bbd52bc7efad15ac5b9f64f4bceabda7a371f20a490512cee324e53373b9a96fd218572c1478b76e5931383dbef00cc25743aa' + '1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9') +b2sums=('1506901352ea84b8016080aa81a0f431b8620c64c0c54364ec56d1878b6413ad965c2d9f39a9bb06d2356c206702283400918b4fb0fa3dac380360f54e60b146' 'SKIP' 'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' - 'ab11b185f32da7a10c22a075d2bf16adadfcfc2d197fc88bd61a03d1873d5cd914cd96edf8af9f054a3cab12629f3f5c29d70d0dce0f0f4bef85f1cfc5a219ee') + '4ac97b908afb915911212686e41c09137bfa909023dc6fa0808cb6cb12f2dcef9597f0d679c98ad1a6b110d11a92025435cd30dd7b87194428b693c555e2bae7') # 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 @@ -98,8 +98,8 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016 - patch -Np1 -i ../0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch + # https://bugzilla.mozilla.org/show_bug.cgi?id=1831691 + patch -Np1 -i ../0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key diff --git a/firefox/repos/testing-x86_64/PKGBUILD b/firefox/repos/testing-x86_64/PKGBUILD deleted file mode 100644 index a6bbb941c6d..00000000000 --- a/firefox/repos/testing-x86_64/PKGBUILD +++ /dev/null @@ -1,268 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Ionut Biru -# Contributor: Jakub Schmidtke - -pkgname=firefox -pkgver=113.0 -pkgrel=1 -pkgdesc="Standalone web browser from mozilla.org" -url="https://www.mozilla.org/firefox/" -arch=(x86_64) -license=( - GPL - LGPL - MPL -) -depends=( - dbus-glib - ffmpeg - gtk3 - libpulse - libxt - mime-types - nss - ttf-font -) -makedepends=( - cbindgen - clang - diffutils - dump_syms - imake - inetutils - jack - lld - llvm - mesa - nasm - nodejs - python - rust - unzip - wasi-compiler-rt - wasi-libc - wasi-libc++ - wasi-libc++abi - xorg-server-xvfb - yasm - zip -) -optdepends=( - 'hunspell-en_US: Spell checking, American English' - 'libnotify: Notification integration' - 'networkmanager: Location detection via available WiFi networks' - 'pulseaudio: Audio support' - 'speech-dispatcher: Text-to-Speech' - 'xdg-desktop-portal: Screensharing with Wayland' -) -options=( - !debug - !emptydirs - !lto - !makeflags - !strip -) -source=( - https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - $pkgname.desktop - identity-icons-brand.svg - 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch -) -validpgpkeys=( - '14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases -) -sha256sums=('7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627' - 'SKIP' - '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' - 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' - '1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9') -b2sums=('1506901352ea84b8016080aa81a0f431b8620c64c0c54364ec56d1878b6413ad965c2d9f39a9bb06d2356c206702283400918b4fb0fa3dac380360f54e60b146' - 'SKIP' - 'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7' - '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' - '4ac97b908afb915911212686e41c09137bfa909023dc6fa0808cb6cb12f2dcef9597f0d679c98ad1a6b110d11a92025435cd30dd7b87194428b693c555e2bae7') - -# 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 -# get your own set of keys. Feel free to contact foutrelis@archlinux.org for -# more information. -_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM - -# Mozilla API keys (see https://location.services.mozilla.com/api) -# Note: These are for Arch Linux use ONLY. For your own distribution, please -# get your own set of keys. Feel free to contact heftig@archlinux.org for -# more information. -_mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a - -prepare() { - mkdir mozbuild - cd firefox-$pkgver - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1831691 - patch -Np1 -i ../0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch - - echo -n "$_google_api_key" >google-api-key - echo -n "$_mozilla_api_key" >mozilla-api-key - - cat >../mozconfig <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - < - - diff --git a/firefox/repos/testing-x86_64/keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc b/firefox/repos/testing-x86_64/keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc deleted file mode 100644 index 6454a2f7c3d..00000000000 --- a/firefox/repos/testing-x86_64/keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc +++ /dev/null @@ -1,63 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=/ReQ ------END PGP PUBLIC KEY BLOCK----- diff --git a/firefox/repos/testing-x86_64/upload-symbol-archive b/firefox/repos/testing-x86_64/upload-symbol-archive deleted file mode 100755 index 059a399c429..00000000000 --- a/firefox/repos/testing-x86_64/upload-symbol-archive +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -e - -die() { - echo >&2 "$@" - exit 1 -} - -(( $# >= 2 )) || die "Usage: $0 TOKEN-FILE SYMBOL-ARCHIVE..." -token="$1" -shift - -[[ -f $token && -s $token ]] || die "Invalid TOKEN-FILE ${token@Q}" - -for zip; do - [[ $(file -SEbi "$zip") == application/zip* ]] || die "Invalid SYMBOL-ARCHIVE ${zip@Q}" -done - -for zip; do - echo >&2 "Uploading ${zip@Q} ..." - curl -X POST -H "Auth-Token: $(<"$token")" -F "${zip##*/}=@$zip" \ - --retry 4 --retry-connrefused --connect-timeout 120 \ - https://symbols.mozilla.org/upload/ - echo - mv -v "$zip" "$zip.uploaded" -done -- 2.11.4.GIT