Removed old files, removed vendor.js, added policies.json

5 files changed, 45 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff7d97b8f14f..86b434497c45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,34 +3,38 @@ pkgbase = firefox-nightly-ru
 	pkgver = 67.0a1.20190201
 	pkgrel = 1
 	url = http://nightly.mozilla.org/
-	install = firefox-nightly-ru.install
 	arch = i686
 	arch = x86_64
 	license = MPL
 	license = GPL
 	license = LGPL
-	depends = alsa-lib
+	depends = dbus-glib
+	depends = gtk3
 	depends = libxt
-	depends = libnotify
-	depends = mime-types
 	depends = nss
-	depends = gtk2
-	depends = gtk3
-	depends = sqlite
-	depends = dbus-glib
-	depends = desktop-file-utils
+	depends = mime-types
+	optdepends = pulseaudio: audio support
+	optdepends = ffmpeg: h.264 video
+	optdepends = hunspell: spell checking
+	optdepends = hyphen: hyphenation
+	optdepends = libnotify: notification integration
+	optdepends = networkmanager: location detection via available WiFi networks
+	optdepends = speech-dispatcher: text-to-speech
+	optdepends = startup-notification: support for FreeDesktop Startup Notification
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
-	source = firefox-nightly-ru.install
-	source = vendor.js
-	source = 20190201-firefox-67.0a1.ru.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2
-	source = 20190201-firefox-67.0a1.ru.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2.asc
+	source = policies.json
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha512sums = 02bd8c8c717e6796fb1772f51c1bfd78ff3ca7c5355c08b9568dc36cb72b8b84330d20522653eedda12bdec1517cd4074a4bc5d51a8667880121e946b85c11ec
-	sha512sums = bc940986f5acb02706714d5dcbc32e17b167190dc9a30c7d63bf5317a45a1a0ff9da5ea302b9c8efc32acf7b75d2dec1420f542cb0ba08c3e3d59273d18baa96
-	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
-	sha512sums = SKIP
-	sha512sums = SKIP
+	sha512sums = 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
+	source_i686 = 20190201-firefox-67.0a1.ru.linux.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-i686.tar.bz2
+	source_i686 = 20190201-firefox-67.0a1.ru.linux.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-i686.tar.bz2.asc
+	sha512sums_i686 = SKIP
+	sha512sums_i686 = SKIP
+	source_x86_64 = 20190201-firefox-67.0a1.ru.linux.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2
+	source_x86_64 = 20190201-firefox-67.0a1.ru.linux.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2.asc
+	sha512sums_x86_64 = SKIP
+	sha512sums_x86_64 = SKIP
 
 pkgname = firefox-nightly-ru
 
diff --git a/PKGBUILD b/PKGBUILD
index a1fb643cb635..572690997856 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _version=67.0a1
 _baseurl="https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/"
 _date="$(date +%Y%m%d)"
-_filename="firefox-${_version}.ru.linux-${CARCH}"
+_filename="firefox-${_version}.ru.linux"
 pkgname=firefox-nightly-ru
 pkgver=${_version}.${_date}
 pkgrel=1
@@ -13,20 +13,26 @@ pkgdesc='Web browser from mozilla.org, nightly build, russian version'
 arch=('i686' 'x86_64')
 url='http://nightly.mozilla.org/'
 license=('MPL' 'GPL' 'LGPL')
-depends=('alsa-lib' 'libxt' 'libnotify' 'mime-types' 'nss' 'gtk2' 'gtk3'
-'sqlite' 'dbus-glib' 'desktop-file-utils')
+depends=('dbus-glib' 'gtk3' 'libxt' 'nss' 'mime-types')
+optdepends=('pulseaudio: audio support'
+            'ffmpeg: h.264 video'
+            'hunspell: spell checking'
+            'hyphen: hyphenation'
+            'libnotify: notification integration'
+            'networkmanager: location detection via available WiFi networks'
+            'speech-dispatcher: text-to-speech'
+            'startup-notification: support for FreeDesktop Startup Notification')
 conflicts=('firefox-nightly')
-install=${pkgname}.install
 source=('firefox-nightly.desktop'
-        'firefox-nightly-ru.install'
-        'vendor.js'
-        "${_date}-${_filename}.tar.bz2::${_baseurl}${_filename}.tar.bz2"
-        "${_date}-${_filename}.tar.bz2.asc::${_baseurl}${_filename}.tar.bz2.asc")
+        'policies.json')
+source_i686=("${_date}-${_filename}.tar.bz2::${_baseurl}${_filename}-i686.tar.bz2"
+        "${_date}-${_filename}.tar.bz2.asc::${_baseurl}${_filename}-i686.tar.bz2.asc")
+source_x86_64=("${_date}-${_filename}.tar.bz2::${_baseurl}${_filename}-x86_64.tar.bz2"
+        "${_date}-${_filename}.tar.bz2.asc::${_baseurl}${_filename}-x86_64.tar.bz2.asc")
 sha512sums=('02bd8c8c717e6796fb1772f51c1bfd78ff3ca7c5355c08b9568dc36cb72b8b84330d20522653eedda12bdec1517cd4074a4bc5d51a8667880121e946b85c11ec'
-         'bc940986f5acb02706714d5dcbc32e17b167190dc9a30c7d63bf5317a45a1a0ff9da5ea302b9c8efc32acf7b75d2dec1420f542cb0ba08c3e3d59273d18baa96'
-         'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
-         'SKIP'
-         'SKIP')
+         '5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308')
+sha512sums_i686=('SKIP' 'SKIP')
+sha512sums_x86_64=('SKIP' 'SKIP')
 validpgpkeys=("14F26682D0916CDD81E37B6D61B7B526D98F0353")
 
 pkgver() {
@@ -39,5 +45,5 @@ package() {
   ln -s /opt/firefox-nightly-ru/firefox "${pkgdir}/usr/bin/firefox-nightly"
   install -m644 "${srcdir}/firefox-nightly.desktop" "${pkgdir}/usr/share/applications/"
   install -m644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/pixmaps/firefox-nightly-icon.png"
-  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/opt/firefox-nightly-ru/browser/defaults/preferences/vendor.js"
+  install -Dm644 "${srcdir}/policies.json" "${pkgdir}/opt/firefox-nightly-ru/distribution"
 }
diff --git a/firefox-nightly-ru.install b/firefox-nightly-ru.install
deleted file mode 100644
index e2f5920b9c83..000000000000
--- a/firefox-nightly-ru.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-   update-desktop-database -q
-}
-
-post_upgrade() {
-   update-desktop-database -q
-}
-
diff --git a/policies.json b/policies.json
new file mode 100644
index 000000000000..f36622021fcd
--- /dev/null
+++ b/policies.json
@@ -0,0 +1,5 @@
+{
+  "policies": {
+    "DisableAppUpdate": true
+  }
+}
diff --git a/vendor.js b/vendor.js
deleted file mode 100644
index caa38c691d4d..000000000000
--- a/vendor.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Disable update check
-pref("app.update.enabled", false);