From b6a309ab30304f2e642e4b9e7cf49c45a8fe66b7 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 24 Oct 2019 15:17:24 -0700 Subject: Updated to 70.0 --- PKGBUILD | 42 +++++++++++++++++++-------------- firefox-symbolic.svg | 64 -------------------------------------------------- mozconfig.in.clang | 2 +- mozconfig.in.clang.pgo | 2 +- 4 files changed, 26 insertions(+), 84 deletions(-) delete mode 100644 firefox-symbolic.svg diff --git a/PKGBUILD b/PKGBUILD index 4c324a0..cf10970 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,14 +18,14 @@ _modclang=0 #_modclang=1 # FIXME pkgname=firefox -pkgver=69.0.3 -pkgrel=1 +pkgver=70.0 +pkgrel=2 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/" -depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib - ffmpeg ttf-font libpulse alsa-lib +depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg + ttf-font libpulse alsa-lib bzip2 libffi icu libjpeg-turbo libevent libvpx nspr nss pixman libpng sqlite libwebp zlib) makedepends=(unzip zip diffutils python-setuptools yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 @@ -40,28 +40,27 @@ optdepends=('networkmanager: Location detection via available WiFi networks' options=(!emptydirs !makeflags) conflicts=(firefox-esr) source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc} - $pkgname.desktop $pkgname-symbolic.svg + no-relinking.patch + 0001-Use-remoting-name-for-GDK-application-names.patch + $pkgname.desktop distribution.ini mozconfig.in mozconfig.in.clang mozconfig.in.clang.pgo mozconfig.common.override - no-relinking.patch - 0001-Use-remoting-name-for-GDK-application-names.patch pgo-1.patch moz.configure.diff package-manifest.diff) -sha256sums=('7527947a876c1734b8b2339f19b8ff8da6f4e4d06351b44940cb48d3509bb891' +sha256sums=('cd9f2902753831c07c4b2ee64f7826f33ca1123add6440dc34abe3ff173a0cc6' 'SKIP' + '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014' + 'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894' 'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33' - '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797' '0ba4d1a619a3a5750a5a48c6bff8c6a69d3aa4be4c303032c5979ab5f68db208' '1cc0730e0f0285f45f30feeeee6d7757931b25263b35b041abd71c2e0486210d' - '0194afec7fa92b08b1583037e2042cbc024238878c3fcb7a4b5b1a61d1274412' - 'b6027c19e7f95ec5c81272b6a2680ca0ffb2d6a520ab8c5f586e9642ee16e351' + '6bf4638134915758466a912dc909fbad165e76cc3807e9eedc659f8f346575fa' + 'b9833cf28af757e17a34e5c7f9db89b97d5c56b8f55cb6bccb70fc48275318af' 'dcf70d24eedab79d811974a75663f0e84c5efca420da61fc444ebe311d0cada9' - '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014' - 'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894' 'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c' 'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e' '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227') @@ -191,18 +190,25 @@ package() { # icons + local i for i in 16 22 24 32 48 64 128 256; do - install -Dm644 browser/branding/official/default$i.png \ + install -Dvm644 browser/branding/official/default$i.png \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done - install -Dm644 browser/branding/official/content/about-logo.png \ + install -Dvm644 browser/branding/official/content/about-logo.png \ "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png" - install -Dm644 browser/branding/official/content/about-logo@2x.png \ + install -Dvm644 browser/branding/official/content/about-logo@2x.png \ "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png" - install -Dm644 ../$pkgname-symbolic.svg \ + install -Dvm644 browser/branding/official/content/identity-icons-brand.svg \ "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" # install desktop file - install -Dm644 ../$pkgname.desktop \ + install -Dvm644 ../$pkgname.desktop \ "$pkgdir/usr/share/applications/$pkgname.desktop" + + # Use system certificates + local nssckbi="$pkgdir/usr/lib/$pkgname/libnssckbi.so" + if [[ -e $nssckbi ]]; then + ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi" + fi } diff --git a/firefox-symbolic.svg b/firefox-symbolic.svg deleted file mode 100644 index 2078eea..0000000 --- a/firefox-symbolic.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - - Gnome Symbolic Icon Theme - - diff --git a/mozconfig.in.clang b/mozconfig.in.clang index 1f7f1a2..60f170e 100644 --- a/mozconfig.in.clang +++ b/mozconfig.in.clang @@ -71,4 +71,4 @@ export MOZ_REQUIRE_SIGNING=0 mk_add_options MOZ_MAKE_FLAGS="-j4" ac_add_options --enable-lto=cross -ac_add_options --enable-profile-use +ac_add_options --enable-profile-use=cross diff --git a/mozconfig.in.clang.pgo b/mozconfig.in.clang.pgo index 97826e6..be9f426 100644 --- a/mozconfig.in.clang.pgo +++ b/mozconfig.in.clang.pgo @@ -70,4 +70,4 @@ export MOZ_REQUIRE_SIGNING=0 mk_add_options MOZ_MAKE_FLAGS="-j4" -ac_add_options --enable-profile-generate +ac_add_options --enable-profile-generate=cross -- cgit v1.2.1