version 55

4 files changed, 91 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd3bb74c7468..4ac65a44164c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,37 @@
 pkgbase = firefox-developer-fr
-	pkgdesc = Standalone web browser from mozilla.org, developer build - French
-	pkgver = 54.0a2
-	pkgrel = 1
-	url = http://www.mozilla.org/firefox/developer
-	arch = i686
+	pkgdesc = Standalone (fr) web browser from mozilla.org, developer build - French Francais
+	pkgver = 55.0b6
+	pkgrel = 2
+	url = https://www.mozilla.org/fr/firefox/developer/
 	arch = x86_64
 	license = MPL
 	license = GPL
 	license = LGPL
-	depends = gtk3
+	depends = alsa-lib
 	depends = libxt
-	depends = startup-notification
+	depends = libnotify
 	depends = mime-types
+	depends = nss
+	depends = gtk2
+	depends = gtk3
+	depends = sqlite
 	depends = dbus-glib
-	depends = alsa-lib
-	depends = dbus-glib
-	depends = libnotify
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = libvpx
-	depends = libevent
-	depends = nss>=3.14.1
-	depends = hunspell
+	optdepends = pulseaudio: audio/video playback
+	optdepends = ffmpeg: h.264 video
+	optdepends = hunspell: spell checking
+	optdepends = hyphen: hyphenation
 	provides = firefox-developer
 	conflicts = firefox-developer
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora-l10n/firefox-54.0a2.fr.linux-x86_64.tar.bz2
+	source = https://ftp.mozilla.org/pub/devedition/releases/55.0b6/linux-x86_64/fr/firefox-55.0b6.tar.bz2
+	source = SHA512SUMS-55.0b6::https://ftp.mozilla.org/pub/devedition/releases/55.0b6/SHA512SUMS
+	source = SHA512SUMS-55.0b6.asc::https://ftp.mozilla.org/pub/devedition/releases/55.0b6/SHA512SUMS.asc
 	source = firefox-developer.desktop
 	source = vendor.js
+	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
+	sha512sums = acae37988a2762fd525927fbe2a95afe8a1f7a07f8e701615b600359ad99250820f8ee24e48dc217a673bf8035a862ea53777c6bd4f1f867a0f30a0b2e265329
+	sha512sums = 3f2ac3b9ad5f509acca49c4de616706a475c1a06c559296703ea54db28f1442b64bf0fece3b75b4df7c4b7a39350b8077b9efb47dae057464c56d5df274c479d
 	sha512sums = SKIP
-	sha512sums = 46d1965a486bec2a533b4642c5190245abf1d58649aba246917ef68abe76b3b789c5aec8df77687dc2bfdaeb146b2ae81d42bfd0b4dacf3b5d6912e92a5948e4
+	sha512sums = 59eb730388f7d2601f40bc3c42ae203e3b65820435adfdfb18cef5d530119304762779b2e493acfdf7bcadb60e2eac3d23304dcf379a1d583d677399ba654456
 	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
 
 pkgname = firefox-developer-fr
diff --git a/PKGBUILD b/PKGBUILD
index ca2e38ef2237..6d7d53651446 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,68 @@
-# Maintainer: Earendil <earendil AT veryfast DOT biz>
-# Contributor: Corelli <corelli AT sent DOT com>
-# Contributor: danyf90 <daniele.formichelli AT gmail DOT com>
-# Contributor: Papajoker <papajoke [at] archlinux [dot] info>
+# Maintainer: Papajoker <papajoke [at] archlinux [dot] info>
+# Based on PKGBUILDs:
+#   `firefox-developer-de` by Leo Schwarz (evotopid) <mail@leoschwarz.com>
+# Pour ajouter la clé : Mozilla Software
+# $ gpg --keyserver pgp.mit.edu --recv-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
 
 _name=firefox
 _channel=developer
-pkgname="${_name}-${_channel}-fr"
-pkgver=54.0a2
-pkgrel=1
-pkgdesc="Standalone web browser from mozilla.org, developer build - French"
-url="http://www.mozilla.org/firefox/developer"
-arch=('i686' 'x86_64')
+_lang=fr
+
+pkgname="${_name}-${_channel}-${_lang}"
+pkgdesc="Standalone (${_lang}) web browser from mozilla.org, developer build - French Francais"
+url='https://www.mozilla.org/fr/firefox/developer/'
+pkgver=55.0b6
+pkgrel=2
+arch=('x86_64')
 license=('MPL' 'GPL' 'LGPL')
-_file="${_name}-${pkgver}.fr.linux-${CARCH}"
-_srcurl="https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora-l10n"
-source=("${_srcurl}/${_file}.tar.bz2" "firefox-$_channel.desktop" "vendor.js")
-sha512sums=('SKIP'
-            '46d1965a486bec2a533b4642c5190245abf1d58649aba246917ef68abe76b3b789c5aec8df77687dc2bfdaeb146b2ae81d42bfd0b4dacf3b5d6912e92a5948e4'
-            'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010')
-depends=('gtk3' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib'
-	 'alsa-lib' 'dbus-glib' 'libnotify' 'desktop-file-utils' 'hicolor-icon-theme'
-	 'libvpx' 'libevent' 'nss>=3.14.1' 'hunspell')
+source=("https://ftp.mozilla.org/pub/devedition/releases/$pkgver/linux-x86_64/$_lang/firefox-$pkgver.tar.bz2"
+        "SHA512SUMS-$pkgver::https://ftp.mozilla.org/pub/devedition/releases/$pkgver/SHA512SUMS"
+        "SHA512SUMS-$pkgver.asc::https://ftp.mozilla.org/pub/devedition/releases/$pkgver/SHA512SUMS.asc"
+        "firefox-$_channel.desktop"
+        "vendor.js")
+depends=('alsa-lib' 'libxt' 'libnotify' 'mime-types' 'nss' 'gtk2' 'gtk3' 'sqlite' 'dbus-glib')
+optdepends=(
+	'pulseaudio: audio/video playback'
+	'ffmpeg: h.264 video'
+	'hunspell: spell checking'
+	'hyphen: hyphenation'
+)
+
 provides=(firefox-developer)
 conflicts=(firefox-developer)
 
+validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')
+
+_verify_checksum() {
+    # Check if hash of the source archive matches the one provided by Mozilla (which was signed with GPG).
+    _checksum=$(grep "linux-x86_64/$_lang/firefox-$pkgver.tar.bz2" "$srcdir/SHA512SUMS-$pkgver" | cut -f1 -d " ")
+    _actual=$(sha512sum "$srcdir/firefox-$pkgver.tar.bz2" | cut -f1 -d " ")
+
+    msg2 "test de l'intégrité de firefox-$pkgver.tar.bz2"
+
+    if [[ $_checksum == $_actual ]];
+    then
+        msg2 "Checksum vérification ok."
+    else
+        msg2 "Checksum vérification erreur!"
+        exit 1
+    fi
+}
+
 package() {
-  install -d $pkgdir/{usr/{bin,share/{applications,pixmaps}},opt}
-  cp -r firefox $pkgdir/opt/firefox-$_channel
+    _verify_checksum
+
+    install -d $pkgdir/{usr/{bin,share/{applications,pixmaps}},opt}
+    cp -r firefox $pkgdir/opt/firefox-$_channel
 
-  ln -s /opt/firefox-$_channel/firefox $pkgdir/usr/bin/firefox-$_channel
-  install -m644 $srcdir/firefox-$_channel.desktop $pkgdir/usr/share/applications/
-  install -m644 $srcdir/firefox/browser/icons/mozicon128.png $pkgdir/usr/share/pixmaps/${_name}-${_channel}-icon.png
-  install -Dm644 $srcdir/vendor.js $pkgdir/opt/firefox-$_channel/browser/defaults/preferences/vendor.js
+    ln -s /opt/firefox-$_channel/firefox $pkgdir/usr/bin/firefox-$_channel
+    install -m644 $srcdir/firefox-$_channel.desktop $pkgdir/usr/share/applications/
+    install -m644 $srcdir/firefox/browser/icons/mozicon128.png $pkgdir/usr/share/pixmaps/firefox-${_channel}-icon.png
+    install -Dm644 $srcdir/vendor.js $pkgdir/opt/firefox-$_channel/browser/defaults/preferences/vendor.js
 }
+
+sha512sums=('acae37988a2762fd525927fbe2a95afe8a1f7a07f8e701615b600359ad99250820f8ee24e48dc217a673bf8035a862ea53777c6bd4f1f867a0f30a0b2e265329'
+            '3f2ac3b9ad5f509acca49c4de616706a475c1a06c559296703ea54db28f1442b64bf0fece3b75b4df7c4b7a39350b8077b9efb47dae057464c56d5df274c479d'
+            'SKIP'
+            '59eb730388f7d2601f40bc3c42ae203e3b65820435adfdfb18cef5d530119304762779b2e493acfdf7bcadb60e2eac3d23304dcf379a1d583d677399ba654456'
+            'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010')
diff --git a/firefox-developer.desktop b/firefox-developer.desktop
index 50c399238511..427471c706af 100644
--- a/firefox-developer.desktop
+++ b/firefox-developer.desktop
@@ -1,12 +1,20 @@
 [Desktop Entry]
 Name=Firefox Développeur
 GenericName=Web Browser
+Comment[fr]=Naviguer sur le Web
 Icon=firefox-developer-icon
 Type=Application
-Categories=Application;Network;
-MimeType=text/html
+Categories=Application;Network;WebBroswer;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 Encoding=UTF-8
-Exec=firefox-developer %u
+Exec=firefox-developer --class=firefox-developer %u
 Terminal=false
 MultipleArgs=false
 StartupNotify=false
+StartupWMClass=firefox-developer
+Keywords=web;browser;internet;
+Actions=new-private-window;
+
+[Desktop Action new-private-window]
+Name=Nouvelle fenêtre de navigation privée
+Exec=firefox-developer --class=firefox-developer --private-window %u
diff --git a/update-pkg.sh b/update-pkg.sh
index eb222c4ba377..dfd85baa76a4 100755
--- a/update-pkg.sh
+++ b/update-pkg.sh
@@ -3,7 +3,7 @@
 # get last pkgver
 pkgver=$(curl -s https://hg.mozilla.org/releases/mozilla-beta/tags | grep -Eo ">FIREFOX_.*_.*_RELEASE<" -m1  | awk -F'_' '{print $2"."$3}')
 echo "last FF-dev release: ${pkgver}"
-sed -ie "s/pkgver=.*/pkgver=${pkgver}/" ./PKGBUILD
+sed -i -e "s/pkgver=.*/pkgver=${pkgver}/" ./PKGBUILD
 
 #makepkg -g -f -p PKGBUILD
 updpkgsums