diff options
| -rw-r--r-- | .SRCINFO | 47 | ||||
| -rw-r--r-- | PKGBUILD | 68 | ||||
| -rw-r--r-- | firefox-symbolic.svg | 3 | ||||
| -rw-r--r-- | org.mozilla.firefox.metainfo.xml | 39 | ||||
| -rwxr-xr-x | upload-symbol-archive | 25 |
5 files changed, 119 insertions, 63 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-vaapi - pkgdesc = Standalone web browser from mozilla.org (with VA-API patches) - pkgver = 126.0 + pkgdesc = Fast, Private & Safe Web Browser (with VA-API patches) + pkgver = 127.0.2 pkgrel = 1 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -26,46 +26,65 @@ pkgbase = firefox-vaapi makedepends = xorg-server-xvfb makedepends = yasm makedepends = zip + depends = alsa-lib + depends = at-spi2-core + depends = bash + depends = cairo depends = dbus depends = ffmpeg + depends = fontconfig + depends = freetype2 + depends = gcc-libs + depends = gdk-pixbuf2 + depends = glib2 + depends = glibc depends = gtk3 + depends = hicolor-icon-theme depends = libpulse + depends = libx11 + depends = libxcb + depends = libxcomposite + depends = libxdamage + depends = libxext + depends = libxfixes + depends = libxrandr depends = libxss depends = libxt depends = mime-types + depends = nspr depends = nss + depends = pango depends = ttf-font optdepends = hunspell-en_US: Spell checking, American English optdepends = libnotify: Notification integration optdepends = networkmanager: Location detection via available WiFi networks - optdepends = pulseaudio: Audio support optdepends = speech-dispatcher: Text-to-Speech optdepends = xdg-desktop-portal: Screensharing with Wayland - provides = firefox=126.0 + provides = firefox=127.0.2 conflicts = firefox options = !emptydirs options = !lto options = !makeflags - source = https://archive.mozilla.org/pub/firefox/releases/126.0/source/firefox-126.0.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/126.0/source/firefox-126.0.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/127.0.2/source/firefox-127.0.2.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/127.0.2/source/firefox-127.0.2.source.tar.xz.asc + source = firefox-symbolic.svg source = firefox.desktop - source = identity-icons-brand.svg - source = https://gitlab.archlinux.org/archlinux/packaging/packages/firefox/-/raw/main/0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch + source = org.mozilla.firefox.metainfo.xml source = 0003-enable-vaapi.patch source = 0004-remove-nvidia-blocklist.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = 910e82a1999ec229e5bc5090a39cec9c575e8bafcac2c54f9bb5c699bd868526 + sha256sums = 0b7b2a8c3def52fcab13c48769645d0e963902ee916e4f3d2a0098796e73e3e8 sha256sums = SKIP - sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044 sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9 - sha256sums = 22c030ef8a047802ae56d20b1c2a6a3830e9a5ac4e5399163a2b57a1c09a20b2 + sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044 + sha256sums = 58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1 sha256sums = 00c449422246283cd7e0bdc65d216fce4a42f755ad881106a08fb7d97eab1679 sha256sums = 75d3c213f3717cfc3f72acd4e3b6d029d373916f9ff9a1e8a3e2d7b0958760ed - b2sums = 9f40424502ccf7516b8b1142372ff816986c07646e88b3e69ca1a6a5173166a3b6c37696c99fbbaece23d01af51a76e56c19df3babc7af4e5d13e5821262ad1b + b2sums = 63221122b5d3ef57f47895fc3583ea4b6dd97a636934054572ac1fb1005777b2d76229124f4b8f293f34791720992489f9ded0e5707d930977fedb160dd0966c b2sums = SKIP - b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628 b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34 - b2sums = 6b8b6fe5d658fd76844fc1d9f47b3892bcb5a59a8d10baabf7d52fb4f7c9e8f4858576859390e6d4c542d46cabb335cd06f8c4a80a7d5dde0868b29cd048d308 + b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628 + b2sums = 2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14 b2sums = f84752e04c7e69b69158b9514a5227a2b71b60ccbbe5acb437d9830bfa2e725fe6784e1603890722a114abda424f9cafc007e9934310f21483b6540bc19da905 b2sums = 87ecd8a3891a9a171173a97cf3b2b5f978be9ec876bb257d9f5e037f21dc5bd91167eabeb1c3cc181260b82cb2774c7b38ad73e1d807cc49b6d95617e2fb5d55 @@ -6,21 +6,41 @@ pkgname=firefox-vaapi _pkgname=firefox -pkgver=126.0 +pkgver=127.0.2 pkgrel=1 -pkgdesc="Standalone web browser from mozilla.org (with VA-API patches)" +pkgdesc="Fast, Private & Safe Web Browser (with VA-API patches)" url="https://www.mozilla.org/firefox/" arch=(x86_64) license=(MPL-2.0) depends=( + alsa-lib + at-spi2-core + bash + cairo dbus ffmpeg + fontconfig + freetype2 + gcc-libs + gdk-pixbuf2 + glib2 + glibc gtk3 + hicolor-icon-theme libpulse + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr libxss libxt mime-types + nspr nss + pango ttf-font ) makedepends=( @@ -50,7 +70,6 @@ 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' ) @@ -63,9 +82,9 @@ options=( ) source=( https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - firefox.desktop - identity-icons-brand.svg - https://gitlab.archlinux.org/archlinux/packaging/packages/firefox/-/raw/main/0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch + $_pkgname-symbolic.svg + $_pkgname.desktop + org.mozilla.$_pkgname.metainfo.xml 0003-enable-vaapi.patch 0004-remove-nvidia-blocklist.patch ) @@ -74,18 +93,18 @@ validpgpkeys=( # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/ 14F26682D0916CDD81E37B6D61B7B526D98F0353 ) -sha256sums=('910e82a1999ec229e5bc5090a39cec9c575e8bafcac2c54f9bb5c699bd868526' +sha256sums=('0b7b2a8c3def52fcab13c48769645d0e963902ee916e4f3d2a0098796e73e3e8' 'SKIP' - '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' - '22c030ef8a047802ae56d20b1c2a6a3830e9a5ac4e5399163a2b57a1c09a20b2' + '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044' + '58d78ce57b3ee936bc966458d6b20ab142d02a897bbe924b3f26717af0c5bee1' '00c449422246283cd7e0bdc65d216fce4a42f755ad881106a08fb7d97eab1679' '75d3c213f3717cfc3f72acd4e3b6d029d373916f9ff9a1e8a3e2d7b0958760ed') -b2sums=('9f40424502ccf7516b8b1142372ff816986c07646e88b3e69ca1a6a5173166a3b6c37696c99fbbaece23d01af51a76e56c19df3babc7af4e5d13e5821262ad1b' +b2sums=('63221122b5d3ef57f47895fc3583ea4b6dd97a636934054572ac1fb1005777b2d76229124f4b8f293f34791720992489f9ded0e5707d930977fedb160dd0966c' 'SKIP' - 'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' - '6b8b6fe5d658fd76844fc1d9f47b3892bcb5a59a8d10baabf7d52fb4f7c9e8f4858576859390e6d4c542d46cabb335cd06f8c4a80a7d5dde0868b29cd048d308' + 'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628' + '2ce33432f8a73a4f1a412b7a065d3c124e1ca9f6bdf3fad0407e897efc0840f8ef43eeeb1b9bef4a102d9fac0b2c4a2ef205726b817f83fe9c3742d076778b14' 'f84752e04c7e69b69158b9514a5227a2b71b60ccbbe5acb437d9830bfa2e725fe6784e1603890722a114abda424f9cafc007e9934310f21483b6540bc19da905' '87ecd8a3891a9a171173a97cf3b2b5f978be9ec876bb257d9f5e037f21dc5bd91167eabeb1c3cc181260b82cb2774c7b38ad73e1d807cc49b6d95617e2fb5d55') @@ -105,9 +124,6 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # Fix build with Rust 1.78.0 - patch -Np1 -i ../0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1809068 # https://bbs.archlinux.org/viewtopic.php?id=281398 # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/firefox-enable-vaapi.patch @@ -141,7 +157,7 @@ ac_add_options --with-distribution-id=org.archlinux ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --allow-addon-sideload export MOZILLA_OFFICIAL=1 -export MOZ_APP_REMOTINGNAME=${_pkgname//-/} +export MOZ_APP_REMOTINGNAME=$_pkgname # Keys ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key @@ -173,6 +189,10 @@ build() { CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + # Breaks compilation since https://bugzilla.mozilla.org/show_bug.cgi?id=1896066 + CFLAGS="${CFLAGS/-fexceptions/}" + CXXFLAGS="${CXXFLAGS/-fexceptions/}" + # LTO needs more open files ulimit -n 4096 @@ -181,7 +201,7 @@ build() { cat >.mozconfig ../mozconfig - <<END ac_add_options --enable-profile-generate=cross END - ./mach build + ./mach build --priority normal echo "Profiling instrumented browser..." ./mach package @@ -197,16 +217,16 @@ END test -s jarlog echo "Removing instrumented browser..." - ./mach clobber + ./mach clobber objdir echo "Building optimized browser..." cat >.mozconfig ../mozconfig - <<END -ac_add_options --enable-lto=cross +ac_add_options --enable-lto=cross,full ac_add_options --enable-profile-use=cross ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog END - ./mach build + ./mach build --priority normal } package() { @@ -264,11 +284,10 @@ END "$pkgdir/usr/share/icons/hicolor/384x384/apps/$_pkgname.png" install -Dvm644 browser/branding/$theme/content/about-logo.svg \ "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" - install -Dvm644 ../identity-icons-brand.svg \ - "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$_pkgname-symbolic.svg" - install -Dvm644 ../${_pkgname}.desktop \ - "$pkgdir/usr/share/applications/${_pkgname}.desktop" + install -Dvm644 ../$_pkgname-symbolic.svg -t "$pkgdir/usr/share/icons/hicolor/symbolic/apps" + install -Dvm644 ../$_pkgname.desktop -t "$pkgdir/usr/share/applications" + install -Dvm644 ../org.mozilla.$_pkgname.metainfo.xml -t "$pkgdir/usr/share/metainfo" # Install a wrapper to avoid confusion about binary path install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$_pkgname" <<END @@ -297,3 +316,4 @@ END } # vim:set sw=2 sts=-1 et: + diff --git a/firefox-symbolic.svg b/firefox-symbolic.svg new file mode 100644 index 000000000000..fc8b1a356768 --- /dev/null +++ b/firefox-symbolic.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> + <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15.424 5.366A4.384 4.384 0 0 0 13.817 3.4a7.893 7.893 0 0 1 .811 2.353v.017c-.9-2.185-2.441-3.066-3.7-4.984l-.189-.3c-.035-.059-.063-.112-.088-.161a1.341 1.341 0 0 1-.119-.306.022.022 0 0 0-.013-.019.026.026 0 0 0-.019 0h-.006a5.629 5.629 0 0 0-2.755 4.308c.094-.006.187-.014.282-.014a4.069 4.069 0 0 1 3.51 1.983A2.838 2.838 0 0 0 9.6 5.824a3.2 3.2 0 0 1-1.885 6.013 3.651 3.651 0 0 1-1.042-.2c-.078-.028-.157-.059-.235-.093-.046-.02-.091-.04-.135-.062A3.282 3.282 0 0 1 4.415 8.95s.369-1.334 2.647-1.334a1.91 1.91 0 0 0 .964-.857 12.756 12.756 0 0 1-1.941-1.118c-.29-.277-.428-.411-.551-.511-.066-.054-.128-.1-.207-.152a3.481 3.481 0 0 1-.022-1.894 5.915 5.915 0 0 0-1.929 1.442A4.108 4.108 0 0 1 3.1 2.584a1.561 1.561 0 0 0-.267.138 5.767 5.767 0 0 0-.783.649 6.9 6.9 0 0 0-.748.868 6.446 6.446 0 0 0-1.08 2.348c0 .009-.076.325-.131.715l-.025.182c-.019.117-.033.245-.048.444v.023c-.005.076-.011.16-.016.258v.04A7.884 7.884 0 0 0 8.011 16a7.941 7.941 0 0 0 7.9-6.44l.036-.3a7.724 7.724 0 0 0-.523-3.894z" /> +</svg> diff --git a/org.mozilla.firefox.metainfo.xml b/org.mozilla.firefox.metainfo.xml new file mode 100644 index 000000000000..4bac0d395d05 --- /dev/null +++ b/org.mozilla.firefox.metainfo.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>org.mozilla.firefox</id> + <launchable type="desktop-id">firefox.desktop</launchable> + <name>Firefox</name> + <developer_name>Mozilla</developer_name> + <summary>Fast, Private & Safe Web Browser</summary> + <metadata_license>CC0-1.0</metadata_license> + <project_license>MPL-2.0</project_license> + <description> + <p>When it comes to your life online, you have a choice: accept the factory settings or put your privacy first. When you choose Firefox as your default browser, you’re choosing to protect your data while supporting an independent tech company. Firefox is also the only major browser backed by a non-profit fighting to give you more openness, transparency and control of your life online. Join hundreds of millions of people who choose to protect what's important by choosing Firefox - a web browser designed to be fast, easy to use, customizable and private.</p> + </description> + <keywords> + <keyword>mozilla</keyword> + <keyword>internet</keyword> + <keyword>web</keyword> + </keywords> + <content_rating type="oars-1.1" /> + <url type="homepage">https://www.mozilla.org/firefox/</url> + <url type="donation">https://donate.mozilla.org/</url> + <url type="bugtracker">https://bugzilla.mozilla.org/</url> + <url type="help">https://support.mozilla.org/</url> + <url type="translate">https://wiki.mozilla.org/L10n:Starting_a_localization</url> + + <screenshots> + <screenshot type="default"> + <image type="source">https://raw.githubusercontent.com/mozilla-releng/scriptworker-scripts/master/pushflatpakscript/media/screenshots/image1.png</image> + <caption>The “New Tab” page</caption> + </screenshot> + <screenshot> + <image type="source">https://raw.githubusercontent.com/mozilla-releng/scriptworker-scripts/master/pushflatpakscript/media/screenshots/image2.png</image> + <caption>A Wikipedia article displayed in Firefox</caption> + </screenshot> + <screenshot> + <image type="source">https://raw.githubusercontent.com/mozilla-releng/scriptworker-scripts/master/pushflatpakscript/media/screenshots/image3.png</image> + <caption>The “Welcome to Firefox” page: “Open up an amazing internet”</caption> + </screenshot> + </screenshots> +</component> diff --git a/upload-symbol-archive b/upload-symbol-archive deleted file mode 100755 index 059a399c429f..000000000000 --- a/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 |
