mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-29 00:25:25 +00:00
extra/firefox to 133.0.3-2
This commit is contained in:
Kevin Mihelich
parent
dc3d7a5e9d
commit
e748689cf3
4 changed files with 110 additions and 15 deletions
|
|
@ -1,7 +1,7 @@
|
|||
pkgbase = firefox
|
||||
pkgdesc = Fast, Private & Safe Web Browser
|
||||
pkgver = 133.0
|
||||
pkgrel = 1
|
||||
pkgver = 133.0.3
|
||||
pkgrel = 2
|
||||
url = https://www.mozilla.org/firefox/
|
||||
arch = x86_64
|
||||
license = MPL-2.0
|
||||
|
|
@ -62,21 +62,24 @@ pkgbase = firefox
|
|||
options = !emptydirs
|
||||
options = !lto
|
||||
options = !makeflags
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/133.0/source/firefox-133.0.source.tar.xz
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/133.0/source/firefox-133.0.source.tar.xz.asc
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/133.0.3/source/firefox-133.0.3.source.tar.xz
|
||||
source = https://archive.mozilla.org/pub/firefox/releases/133.0.3/source/firefox-133.0.3.source.tar.xz.asc
|
||||
source = firefox-symbolic.svg
|
||||
source = firefox.desktop
|
||||
source = org.mozilla.firefox.metainfo.xml
|
||||
source = 0001-Install-under-remoting-name.patch
|
||||
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
sha256sums = 492b2c9a3b6d215e38ce490624e8b2b9473419accdeaddb24ba00bc6adc3cc60
|
||||
sha256sums = f134a5420200bb03ab460f9d2867507c0edb222ce73faf4064cdbea02a0aca1b
|
||||
sha256sums = SKIP
|
||||
sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
|
||||
sha256sums = 71fe797430198ac8c00b538dce537284cf526e48be0496698cf5a980d70c16da
|
||||
sha256sums = 58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1
|
||||
b2sums = 6c356a4d34044825e86f712b959cbfa6ee27c989c74e42b0b276ee6b169ca84b467ed5ea82f850a517694b75be104362273075c2aa6019f9d30e1be4035b3dd6
|
||||
sha256sums = 23f557fa7989adcae03cc9458d94716981dbcf0e9d6d52a289a2426e50b4b785
|
||||
sha256sums = 883ca2fa723a7572269d18559d5b82412782ad63e5dd3820eeb0540e3fe34314
|
||||
b2sums = e686408397a886e36ead739851ec190f108db2bda92b7147ec16c12233459dc23ab256ba125fb8902fb2a855ea76d9cb02e6c55ea62e7639f8700dba6bae9acb
|
||||
b2sums = SKIP
|
||||
b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
|
||||
b2sums = 2c7936949ef922307fb593bd0480a13bde2eab8ae24fc89071d809d6659384705f9b7838b1ae8bc46b98a152ba01fcffad606d4c84796ad9bfaaf20166f0a0fd
|
||||
b2sums = 2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14
|
||||
b2sums = 1a7fc030b1051df00df1b2f5b247b8c658de6cdfba0788041c830da3aaaa6ac974ab684e05feb80672aa2d2c22294cacfa93a71dc664b3e60becdd65e879fcee
|
||||
b2sums = 8a894b01e405b628877483e40e9b018647977cb053b6af02afc901ed24d6e1f767f3db8c321070e33aea4a05ba16f1eb47ae600e5299b5f9caad03d20ba38cf5
|
||||
|
||||
pkgname = firefox
|
||||
|
|
|
|||
55
extra/firefox/0001-Install-under-remoting-name.patch
Normal file
55
extra/firefox/0001-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 188ce9875ae8..f7e3d0ca1935 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 $(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);
|
||||
}
|
||||
}
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
highmem=1
|
||||
|
||||
pkgname=firefox
|
||||
pkgver=133.0
|
||||
pkgrel=1
|
||||
pkgver=133.0.3
|
||||
pkgrel=2
|
||||
pkgdesc="Fast, Private & Safe Web Browser"
|
||||
url="https://www.mozilla.org/firefox/"
|
||||
arch=(x86_64)
|
||||
|
|
@ -83,22 +83,25 @@ source=(
|
|||
$pkgname-symbolic.svg
|
||||
$pkgname.desktop
|
||||
org.mozilla.$pkgname.metainfo.xml
|
||||
0001-Install-under-remoting-name.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=('492b2c9a3b6d215e38ce490624e8b2b9473419accdeaddb24ba00bc6adc3cc60'
|
||||
sha256sums=('f134a5420200bb03ab460f9d2867507c0edb222ce73faf4064cdbea02a0aca1b'
|
||||
'SKIP'
|
||||
'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
|
||||
'71fe797430198ac8c00b538dce537284cf526e48be0496698cf5a980d70c16da'
|
||||
'58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1')
|
||||
b2sums=('6c356a4d34044825e86f712b959cbfa6ee27c989c74e42b0b276ee6b169ca84b467ed5ea82f850a517694b75be104362273075c2aa6019f9d30e1be4035b3dd6'
|
||||
'23f557fa7989adcae03cc9458d94716981dbcf0e9d6d52a289a2426e50b4b785'
|
||||
'883ca2fa723a7572269d18559d5b82412782ad63e5dd3820eeb0540e3fe34314')
|
||||
b2sums=('e686408397a886e36ead739851ec190f108db2bda92b7147ec16c12233459dc23ab256ba125fb8902fb2a855ea76d9cb02e6c55ea62e7639f8700dba6bae9acb'
|
||||
'SKIP'
|
||||
'63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
|
||||
'2c7936949ef922307fb593bd0480a13bde2eab8ae24fc89071d809d6659384705f9b7838b1ae8bc46b98a152ba01fcffad606d4c84796ad9bfaaf20166f0a0fd'
|
||||
'2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14')
|
||||
'1a7fc030b1051df00df1b2f5b247b8c658de6cdfba0788041c830da3aaaa6ac974ab684e05feb80672aa2d2c22294cacfa93a71dc664b3e60becdd65e879fcee'
|
||||
'8a894b01e405b628877483e40e9b018647977cb053b6af02afc901ed24d6e1f767f3db8c321070e33aea4a05ba16f1eb47ae600e5299b5f9caad03d20ba38cf5')
|
||||
|
||||
# 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
|
||||
|
|
@ -111,6 +114,9 @@ prepare() {
|
|||
mkdir mozbuild
|
||||
cd firefox-$pkgver
|
||||
|
||||
# Make different channels installable in parallel
|
||||
patch -Np1 -i ../0001-Install-under-remoting-name.patch
|
||||
|
||||
echo -n "$_google_api_key" >google-api-key
|
||||
|
||||
cat >.mozconfig <<END
|
||||
|
|
|
|||
|
|
@ -2,8 +2,38 @@
|
|||
<component type="desktop-application">
|
||||
<id>org.mozilla.firefox</id>
|
||||
<launchable type="desktop-id">firefox.desktop</launchable>
|
||||
<provides>
|
||||
<binary>firefox</binary>
|
||||
<mediatype>application/json</mediatype>
|
||||
<mediatype>application/pdf</mediatype>
|
||||
<mediatype>application/rdf+xml</mediatype>
|
||||
<mediatype>application/rss+xml</mediatype>
|
||||
<mediatype>application/x-xpinstall</mediatype>
|
||||
<mediatype>application/xhtml+xml</mediatype>
|
||||
<mediatype>application/xml</mediatype>
|
||||
<mediatype>audio/flac</mediatype>
|
||||
<mediatype>audio/ogg</mediatype>
|
||||
<mediatype>audio/webm</mediatype>
|
||||
<mediatype>image/avif</mediatype>
|
||||
<mediatype>image/gif</mediatype>
|
||||
<mediatype>image/jpeg</mediatype>
|
||||
<mediatype>image/png</mediatype>
|
||||
<mediatype>image/svg+xml</mediatype>
|
||||
<mediatype>image/webp</mediatype>
|
||||
<mediatype>text/html</mediatype>
|
||||
<mediatype>text/xml</mediatype>
|
||||
<mediatype>video/ogg</mediatype>
|
||||
<mediatype>video/webm</mediatype>
|
||||
<mediatype>x-scheme-handler/chrome</mediatype>
|
||||
<mediatype>x-scheme-handler/http</mediatype>
|
||||
<mediatype>x-scheme-handler/https</mediatype>
|
||||
<mediatype>x-scheme-handler/mailto</mediatype>
|
||||
</provides>
|
||||
<name>Firefox</name>
|
||||
<developer_name>Mozilla</developer_name>
|
||||
<developer id="org.mozilla">
|
||||
<name>Mozilla</name>
|
||||
<url>https://www.mozilla.org/</url>
|
||||
</developer>
|
||||
<summary>Fast, Private & Safe Web Browser</summary>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>MPL-2.0</project_license>
|
||||
|
|
@ -37,3 +67,4 @@
|
|||
</screenshot>
|
||||
</screenshots>
|
||||
</component>
|
||||
<!-- vim:set sw=2 sts=-1 et: -->
|
||||
|
|
|
|||
Loading…
Reference in a new issue