Update desktop files; pull hi-def icons

4 files changed, 22 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d3e99bd729a..a323293a9d8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = firefox-always-nightly
 pkgname = firefox-always-nightly
 pkgdesc = Standalone web browser from mozilla.org, nightly build, always updating
 pkgver = 99.0a1
-pkgrel = 15
+pkgrel = 16
 url = https://blog.nightly.mozilla.org/
 arch = i686
 arch = x86_64
@@ -17,13 +17,15 @@ depends = nss
 provides = firefox-nightly
 conflicts = firefox-nightly
 source = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-VERSION.en-US.linux-ARCH.tar.bz2
+source = https://design.firefox.com/product-identity/firefox-nightly/firefox-logo-nightly.svg
+source = https://design.firefox.com/product-identity/firefox-nightly/firefox-logo-nightly.png
 source = firefox-nightly.desktop
 source = firefox-nightly-safe.desktop
 source = vendor.js
 sha512sums = 
-sha512sums = 
-sha512sums = 4c318df0ac89dc273f0c1c6a7dcb4e943634bae8c532b4646e833ee5ee2fdd3eaed8da490385b11705e7f7bb6e0679dfd1dc9e070b3b0f9d3f9af7801a934962
-sha512sums = 00caf982c072c7499433c494ecf2096542c4ddf368c4b97fb22672fd669683911d009a65a498b8a03da61ae9aa5a4e8bdaa6e58b148c2a5d7c008910b2af26a5
+sha512sums = f07445bbb6c97a803062b498c81063414ba83660d746ba5abd712d9c8e8e1469df9a015163ad8548298604630e1bfe586d78fb64f9966506770a2c45ae5be323
+sha512sums = 4cd0552df782a022a4a6bc56cf62eb3216470776f51b2bb817203095b876550d9b9856c0c5dbdcbc490869129296e0007bc0128d60a450fbc8a725443a915156
+sha512sums = e83bc6604c21d0f53845fb87abc4fd3a50c4375747d1c770322edf5bee6e7f21c46f1fd98269b44889f0c5fa69ac572302c6f184ce11b3ea371ce1ac3c469b39
+sha512sums = ee5dbab349e9c9c995bccea711aacdab1db09b38072ce194f88c0c2259aef38af6dc8727ecf218ff003dc10718588200927809bd71465eb95c6298c6f7e0dbc6
 sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
 
-
diff --git a/PKGBUILD b/PKGBUILD
index fcaf39a69bb1..cf4836aca15b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=firefox-always-nightly
 pkgdesc='Standalone web browser from mozilla.org, nightly build, always updating'
 url='https://blog.nightly.mozilla.org/'
 pkgver=99.0a1
-pkgrel=15
+pkgrel=16
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 _srcurl="https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central"
@@ -24,15 +24,19 @@ pkgver() {
 }
 
 source=("${pkgname}-$(pkgver).tar.bz2::${_srcurl}/${_file}.tar.bz2"
+        'https://design.firefox.com/product-identity/firefox-nightly/firefox-logo-nightly.svg'
+        'https://design.firefox.com/product-identity/firefox-nightly/firefox-logo-nightly.png'
         'firefox-nightly.desktop'
         'firefox-nightly-safe.desktop'
         'vendor.js')
 sha512sums=("${_shasum}"
-            '4c318df0ac89dc273f0c1c6a7dcb4e943634bae8c532b4646e833ee5ee2fdd3eaed8da490385b11705e7f7bb6e0679dfd1dc9e070b3b0f9d3f9af7801a934962'
-            '00caf982c072c7499433c494ecf2096542c4ddf368c4b97fb22672fd669683911d009a65a498b8a03da61ae9aa5a4e8bdaa6e58b148c2a5d7c008910b2af26a5'
+            'f07445bbb6c97a803062b498c81063414ba83660d746ba5abd712d9c8e8e1469df9a015163ad8548298604630e1bfe586d78fb64f9966506770a2c45ae5be323'
+            '4cd0552df782a022a4a6bc56cf62eb3216470776f51b2bb817203095b876550d9b9856c0c5dbdcbc490869129296e0007bc0128d60a450fbc8a725443a915156'
+            'e83bc6604c21d0f53845fb87abc4fd3a50c4375747d1c770322edf5bee6e7f21c46f1fd98269b44889f0c5fa69ac572302c6f184ce11b3ea371ce1ac3c469b39'
+            'ee5dbab349e9c9c995bccea711aacdab1db09b38072ce194f88c0c2259aef38af6dc8727ecf218ff003dc10718588200927809bd71465eb95c6298c6f7e0dbc6'
             'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010')
 
-depends=('dbus-glib' 'gtk3' 'libxt' 'nss' 'mime-types')
+depends=('dbus-glib' 'gtk3' 'libxt' 'mime-types' 'nss')
 optdepends=('pulseaudio: audio support'
             'ffmpeg: h.264 video'
             'gtk2: flash plugin support'
@@ -52,6 +56,8 @@ package() {
 
   ln -s /opt/firefox-nightly/firefox "${pkgdir}/usr/bin/firefox-nightly"
   install -m644 "${srcdir}"/{firefox-nightly.desktop,firefox-nightly-safe.desktop} "${pkgdir}/usr/share/applications/"
-  install -m644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/pixmaps/firefox-nightly-icon.png"
+  install -m644 "${srcdir}/firefox-logo-nightly.png" "${pkgdir}/usr/share/pixmaps/firefox-nightly.png"
+  install -m644 "${srcdir}/firefox-logo-nightly.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/firefox-nightly.svg"
+  install -m644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/firefox-nightly.png"
   install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/opt/firefox-nightly/browser/defaults/preferences/vendor.js"
 }
diff --git a/firefox-nightly-safe.desktop b/firefox-nightly-safe.desktop
index 302437cd73c0..95d039df509f 100644
--- a/firefox-nightly-safe.desktop
+++ b/firefox-nightly-safe.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Firefox Nightly - Safe Mode
 GenericName=Web Browser - Safe Mode
-Icon=firefox-nightly-icon
+Icon=firefox-nightly
 Type=Application
 Categories=Application;Network;
 MimeType=text/html
@@ -10,3 +10,4 @@ Exec=firefox-nightly -safe-mode %u
 Terminal=false
 MultipleArgs=false
 StartupNotify=false
+StartupWMClass=Nightly
diff --git a/firefox-nightly.desktop b/firefox-nightly.desktop
index 3c4a57349f0a..147208e984bb 100644
--- a/firefox-nightly.desktop
+++ b/firefox-nightly.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Firefox Nightly
 GenericName=Web Browser
-Icon=firefox-nightly-icon
+Icon=firefox-nightly
 Type=Application
 Categories=Application;Network;
 MimeType=text/html
@@ -9,4 +9,4 @@ Encoding=UTF-8
 Exec=firefox-nightly %u
 Terminal=false
 MultipleArgs=false
-StartupWMClass=Firefox
+StartupWMClass=Nightly