mirror of
https://github.com/archlinux/aur.git
synced 2026-01-27 20:28:31 +01:00
[firefox-vaapi] Update to 147.0
This commit is contained in:
D. Can Celasun
parent
c1437e532b
commit
243ae423d9
3 changed files with 77 additions and 18 deletions
17
.SRCINFO
17
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = firefox-vaapi
|
||||
pkgdesc = Fast, Private & Safe Web Browser (with VA-API patches)
|
||||
pkgver = 146.0.1
|
||||
pkgver = 147.0
|
||||
pkgrel = 1
|
||||
url = https://www.mozilla.org/firefox/
|
||||
arch = x86_64
|
||||
|
|
@ -31,7 +31,7 @@ pkgbase = firefox-vaapi
|
|||
depends = bash
|
||||
depends = cairo
|
||||
depends = dbus
|
||||
depends = ffmpeg4.4
|
||||
depends = ffmpeg
|
||||
depends = fontconfig
|
||||
depends = freetype2
|
||||
depends = gcc-libs
|
||||
|
|
@ -61,29 +61,32 @@ pkgbase = firefox-vaapi
|
|||
optdepends = onnxruntime: Local machine learning features such as smart tab groups
|
||||
optdepends = speech-dispatcher: Text-to-Speech
|
||||
optdepends = xdg-desktop-portal: Screensharing with Wayland
|
||||
provides = firefox=146.0.1
|
||||
provides = firefox=147.0
|
||||
conflicts = firefox
|
||||
options = !emptydirs
|
||||
options = !lto
|
||||
options = !makeflags
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/146.0.1/source/firefox-146.0.1.source.tar.xz
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/146.0.1/source/firefox-146.0.1.source.tar.xz.asc
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/147.0/source/firefox-147.0.source.tar.xz
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/147.0/source/firefox-147.0.source.tar.xz.asc
|
||||
source = firefox-symbolic.svg
|
||||
source = firefox.desktop
|
||||
source = org.mozilla.firefox.metainfo.xml
|
||||
source = 0001-remove-nvidia-blocklist.patch
|
||||
source = 0002-Install-under-remoting-name.patch
|
||||
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
sha256sums = e9678a0e8473923953e1dc312c37919068623b6aa20adade16266049258191eb
|
||||
sha256sums = 222d8e63754f1e5b1789cb928d7f973e0168819c492bb0eb402b1d472e4fd9fe
|
||||
sha256sums = SKIP
|
||||
sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
|
||||
sha256sums = a0a236be070594f576b670a0988449b7bc1eaf5b94ba2ca15807e484c794d4dc
|
||||
sha256sums = 58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1
|
||||
sha256sums = 06e30b49678a48f4b6d5eb74de91f743734c7d21efd442777c77aee8cf5dad85
|
||||
b2sums = 808e1205697d2cd12c4ec4a21c59e6ab11f6fffef3031a848ca5823aaa1d507edaffd514e9471d9916bfb4ede645d4c5b03c1e6b0b638b22ce533998fa033bbf
|
||||
sha256sums = ef63a12975f108f30b00bb3290d9ca76f311d8af9c1d5dfc0d8335ad57e8f77c
|
||||
b2sums = 8d5e474bc37d7bedd20953a6c519129fa1d56912ef1ffd06582c8db9128e714239173c954b6f5f13a1fe7740d7391c770c684562108f7fd79900d0bf56c4e12e
|
||||
b2sums = SKIP
|
||||
b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
|
||||
b2sums = 6b7638446d4c262363af460382204e6d82138a5a22009969b198b7c4f58f9d9951330869a37e393885293733746d8790cd71e42f4e81004d533beed9e97816a7
|
||||
b2sums = 2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14
|
||||
b2sums = a59a736b1176ce523ec61357bc918b5792e7e35db0239e6776179d1e5942fd69640735ebf19e0824b71ddbdb3bd96a836e89cd2dced498a32374ebd7308db778
|
||||
b2sums = ff0ba11844e99ab1b1fed91d70c6f45837198ba43e77313c8b9c48a621e40c459953fc35283b6b6eafb5641510a5ce1e18ebda4d7d076f8212810391c0a9234b
|
||||
|
||||
pkgname = firefox-vaapi
|
||||
|
|
|
|||
55
0002-Install-under-remoting-name.patch
Normal file
55
0002-Install-under-remoting-name.patch
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Fri, 27 Sep 2024 02:01:02 +0200
|
||||
Subject: [PATCH] Install under remoting name
|
||||
|
||||
Also reverts https://phabricator.services.mozilla.com/D210285, which
|
||||
causes conflicts between the channels.
|
||||
---
|
||||
config/baseconfig.mk | 2 +-
|
||||
toolkit/mozapps/installer/packager.mk | 4 ++--
|
||||
xpcom/glue/XREAppData.cpp | 3 +--
|
||||
3 files changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/config/baseconfig.mk b/config/baseconfig.mk
|
||||
index 428beef48e14..13a609c1cfe9 100644
|
||||
--- a/config/baseconfig.mk
|
||||
+++ b/config/baseconfig.mk
|
||||
@@ -2,7 +2,7 @@
|
||||
# directly in python/mozbuild/mozbuild/base.py for gmake validation.
|
||||
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
|
||||
# whether a normal build is happening or whether the check is running.
|
||||
-installdir = $(libdir)/$(MOZ_APP_NAME)
|
||||
+installdir = $(libdir)/$(MOZ_APP_REMOTINGNAME)
|
||||
ifeq (.,$(DEPTH))
|
||||
DIST = dist
|
||||
else
|
||||
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
|
||||
index 6cb379fb9764..5cd62d5940ff 100644
|
||||
--- a/toolkit/mozapps/installer/packager.mk
|
||||
+++ b/toolkit/mozapps/installer/packager.mk
|
||||
@@ -168,8 +168,8 @@ endif
|
||||
(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
|
||||
(cd $(DESTDIR)$(installdir) && tar -xf -)
|
||||
$(NSINSTALL) -D $(DESTDIR)$(bindir)
|
||||
- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
|
||||
- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
|
||||
+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_REMOTINGNAME)
|
||||
+ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZ_APP_REMOTINGNAME)
|
||||
|
||||
upload:
|
||||
$(PYTHON3) -u $(MOZILLA_DIR)/build/upload.py --base-path $(ABS_DIST) $(UPLOAD_FILES)
|
||||
diff --git a/xpcom/glue/XREAppData.cpp b/xpcom/glue/XREAppData.cpp
|
||||
index 7757e6c66366..82084d3b5f82 100644
|
||||
--- a/xpcom/glue/XREAppData.cpp
|
||||
+++ b/xpcom/glue/XREAppData.cpp
|
||||
@@ -52,8 +52,7 @@ void XREAppData::GetDBusAppName(nsACString& aName) const {
|
||||
if (env) {
|
||||
aName.Assign(env);
|
||||
} else {
|
||||
- aName.Assign(name);
|
||||
- ToLowerCase(aName);
|
||||
+ aName.Assign(remotingName);
|
||||
SanitizeNameForDBus(aName);
|
||||
}
|
||||
}
|
||||
23
PKGBUILD
23
PKGBUILD
|
|
@ -1,12 +1,11 @@
|
|||
# Maintainer: Duru Can Celasun <can[at]dcc[dot]im>
|
||||
# Contributor: Ewout van Mansom <ewout@vanmansom.name>
|
||||
# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
||||
# Contributor: Ionut Biru <ibiru@archlinux.org>
|
||||
# Contributor: Jakub Schmidtke <sjakub@gmail.com>
|
||||
|
||||
pkgname=firefox-vaapi
|
||||
_pkgname=firefox
|
||||
pkgver=146.0.1
|
||||
pkgver=147.0
|
||||
pkgrel=1
|
||||
pkgdesc="Fast, Private & Safe Web Browser (with VA-API patches)"
|
||||
url="https://www.mozilla.org/firefox/"
|
||||
|
|
@ -18,7 +17,7 @@ depends=(
|
|||
bash
|
||||
cairo
|
||||
dbus
|
||||
ffmpeg4.4
|
||||
ffmpeg
|
||||
fontconfig
|
||||
freetype2
|
||||
gcc-libs
|
||||
|
|
@ -87,24 +86,27 @@ source=(
|
|||
$_pkgname.desktop
|
||||
org.mozilla.$_pkgname.metainfo.xml
|
||||
0001-remove-nvidia-blocklist.patch
|
||||
0002-Install-under-remoting-name.patch
|
||||
)
|
||||
validpgpkeys=(
|
||||
# Mozilla Software Releases <release@mozilla.com>
|
||||
# https://blog.mozilla.org/security/2025/04/01/updated-gpg-key-for-signing-firefox-releases-2/
|
||||
14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
)
|
||||
sha256sums=('e9678a0e8473923953e1dc312c37919068623b6aa20adade16266049258191eb'
|
||||
sha256sums=('222d8e63754f1e5b1789cb928d7f973e0168819c492bb0eb402b1d472e4fd9fe'
|
||||
'SKIP'
|
||||
'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
|
||||
'a0a236be070594f576b670a0988449b7bc1eaf5b94ba2ca15807e484c794d4dc'
|
||||
'58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1'
|
||||
'06e30b49678a48f4b6d5eb74de91f743734c7d21efd442777c77aee8cf5dad85')
|
||||
b2sums=('808e1205697d2cd12c4ec4a21c59e6ab11f6fffef3031a848ca5823aaa1d507edaffd514e9471d9916bfb4ede645d4c5b03c1e6b0b638b22ce533998fa033bbf'
|
||||
'06e30b49678a48f4b6d5eb74de91f743734c7d21efd442777c77aee8cf5dad85'
|
||||
'ef63a12975f108f30b00bb3290d9ca76f311d8af9c1d5dfc0d8335ad57e8f77c')
|
||||
b2sums=('8d5e474bc37d7bedd20953a6c519129fa1d56912ef1ffd06582c8db9128e714239173c954b6f5f13a1fe7740d7391c770c684562108f7fd79900d0bf56c4e12e'
|
||||
'SKIP'
|
||||
'63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
|
||||
'6b7638446d4c262363af460382204e6d82138a5a22009969b198b7c4f58f9d9951330869a37e393885293733746d8790cd71e42f4e81004d533beed9e97816a7'
|
||||
'2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14'
|
||||
'a59a736b1176ce523ec61357bc918b5792e7e35db0239e6776179d1e5942fd69640735ebf19e0824b71ddbdb3bd96a836e89cd2dced498a32374ebd7308db778')
|
||||
'a59a736b1176ce523ec61357bc918b5792e7e35db0239e6776179d1e5942fd69640735ebf19e0824b71ddbdb3bd96a836e89cd2dced498a32374ebd7308db778'
|
||||
'ff0ba11844e99ab1b1fed91d70c6f45837198ba43e77313c8b9c48a621e40c459953fc35283b6b6eafb5641510a5ce1e18ebda4d7d076f8212810391c0a9234b')
|
||||
|
||||
# Google API keys (see https://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: These are for Arch Linux use ONLY. For your own distribution, please
|
||||
|
|
@ -119,6 +121,9 @@ prepare() {
|
|||
msg2 "Patching Nvidia blocklist"
|
||||
patch -Np1 -i ../0001-remove-nvidia-blocklist.patch
|
||||
|
||||
# Make different channels installable in parallel
|
||||
patch -Np1 -i ../0002-Install-under-remoting-name.patch
|
||||
|
||||
echo -n "$_google_api_key" >google-api-key
|
||||
|
||||
cat >../mozconfig <<END
|
||||
|
|
@ -132,7 +137,6 @@ ac_add_options --enable-optimize
|
|||
ac_add_options --enable-rust-simd
|
||||
ac_add_options --enable-linker=lld
|
||||
ac_add_options --disable-install-strip
|
||||
ac_add_options --disable-elf-hack
|
||||
ac_add_options --disable-bootstrap
|
||||
ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
|
||||
|
||||
|
|
@ -170,9 +174,6 @@ build() {
|
|||
export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)"
|
||||
export MOZ_NOSPAM=1
|
||||
|
||||
# Work around https://bugzilla.mozilla.org/show_bug.cgi?id=1969383
|
||||
export RUST_MIN_STACK=16777216
|
||||
|
||||
# malloc_usable_size is used in various parts of the codebase
|
||||
CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
|
||||
CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue