[arch-commits] Commit in firefox-developer-edition/trunk (2 files)

[Andrew Crerar]

    Date: Friday, November 5, 2021 @ 18:18:24
  Author: andrewsc
Revision: 1037225

upgpkg: firefox-developer-edition 95.0b3-1

- Removed telemetry reporting being enabled by default (GDPR compliance)
- Added additional verbosity to install commands
- Updated desktop entry to reference class name for Wayland window icons

Modified:
  firefox-developer-edition/trunk/PKGBUILD
  firefox-developer-edition/trunk/firefox-developer-edition.desktop

-----------------------------------+
 PKGBUILD                          |   30 +++++++++++++++---------------
 firefox-developer-edition.desktop |    6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-05 17:01:02 UTC (rev 1037224)
+++ PKGBUILD	2021-11-05 18:18:24 UTC (rev 1037225)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=firefox-developer-edition
-pkgver=95.0b2
+pkgver=95.0b3
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -25,11 +25,11 @@
         0001-Use-remoting-name-for-GDK-application-names.patch
         "$pkgname".desktop
         identity-icons-brand.svg)
-sha512sums=('e96189b862750294594ff9546cb45a14814efeacae5f3c566fe1015965959736c072fe748c83cf616af07fca7c2b264c4ccfdf9476b08d044053588ce7ee77ab'
+sha512sums=('b684139b9a4ac076c33f59b6f9b09ddde235881f7ae693ba6d86f868af251d74b485a2808f7ee372e44c3ae377380eb0c135337596c5a94d2816557bef1efa39'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             'f00f547a55df90a2f96c7b5f3a3c46b033f985db9a12257cb57f617ae8e0df9558baf6a79a7825f4866de45f9f4875cbbf1f0b99cd44371e047c6bc5dc6c78ba'
-            '3b42fe7dc8f53952330e57f1e85b46c5bd4b0c4ebc2796e0f5230446d10a67cf0fcbaadcbbb30888a99d43ca888a4e753aa5ddfbf93269cc22a6f640ba611ea3'
+            '2ff0cb8e2eb94cee306b488adf6d7f4debbaff6155be3ed3eeee814cdb356e2e60fe38cc29d6c8d10079937fd2c930cfddf283977cf645395d31eaf76c7f0ac2'
             'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
@@ -78,7 +78,6 @@
 ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
 export MOZ_APP_REMOTINGNAME=${pkgname//-/}
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_REQUIRE_SIGNING=
 
 # Keys
@@ -151,7 +150,7 @@
   DESTDIR="$pkgdir" ./mach install
 
   local vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
-  install -Dm644 /dev/stdin "$vendorjs" << END
+  install -Dvm644 /dev/stdin "$vendorjs" << END
 // Use LANG environment variable to choose locale.
 pref("intl.locale.requested", "");
 
@@ -166,7 +165,7 @@
 END
 
   local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
-  install -Dm644 /dev/stdin "$distini" << END
+  install -Dvm644 /dev/stdin "$distini" << END
 [Global]
 id=archlinux
 version=1.0
@@ -178,24 +177,25 @@
 app.partner.archlinux=archlinux
 END
 
+  local i theme=aurora
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 browser/branding/aurora/default$i.png \
+    install -Dvm644 browser/branding/$theme/default$i.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 browser/branding/aurora/content/about-logo.png \
+  install -Dvm644 browser/branding/$theme/content/about-logo.png \
     "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
-  install -Dm644 browser/branding/aurora/content/about-logo at 2x.png \
+  install -Dvm644 browser/branding/$theme/content/about-logo at 2x.png \
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
-  install -Dm644 browser/branding/aurora/content/about-logo.svg \
+  install -Dvm644 browser/branding/$theme/content/about-logo.svg \
     "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
-  install -Dm644 ../identity-icons-brand.svg \
+  install -Dvm644 ../identity-icons-brand.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
-  install -Dm644 ../$pkgname.desktop \
+  install -Dvm644 ../$pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Install a wrapper to avoid confusion about binary path
-  install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" << END
+  install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" << END
 #!/bin/sh
 exec /usr/lib/$pkgname/firefox "\$@"
 END
@@ -202,12 +202,12 @@
 
   # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -srf "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/firefox-bin"
+  ln -srfv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/firefox-bin"
 
   # Use system certificates
   local nssckbi="$pkgdir/usr/lib/$pkgname/libnssckbi.so"
   if [[ -e $nssckbi ]]; then
-    ln -srf "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
+    ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
   fi
 
   export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE="$startdir/.crash-stats-api.token"

Modified: firefox-developer-edition.desktop
===================================================================
--- firefox-developer-edition.desktop	2021-11-05 17:01:02 UTC (rev 1037224)
+++ firefox-developer-edition.desktop	2021-11-05 18:18:24 UTC (rev 1037225)
@@ -112,7 +112,7 @@
 Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
 Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;Firefox;ff;互联网;网站;
 Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐
-Exec=/usr/lib/firefox-developer-edition/firefox %u
+Exec=/usr/lib/firefox-developer-edition/firefox --class="firefoxdeveloperedition" %u
 Icon=firefox-developer-edition
 Terminal=false
 X-MultipleArgs=false
@@ -229,7 +229,7 @@
 Name[xh]=Ifestile entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
-Exec=/usr/lib/firefox-developer-edition/firefox --new-window %u
+Exec=/usr/lib/firefox-developer-edition/firefox --class="firefoxdeveloperedition" --new-window %u
 
 [Desktop Action new-private-window]
 Name=New Private Window
@@ -337,4 +337,4 @@
 Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
-Exec=/usr/lib/firefox-developer-edition/firefox --private-window %u
+Exec=/usr/lib/firefox-developer-edition/firefox --class="firefoxdeveloperedition" --private-window %u