updating pkgbuild

4 files changed, 27 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8861f81d5ab5..3e3b8211f063 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly-es-es
 	pkgdesc = Standalone Web Browser from Mozilla — Nightly build (es-ES)
-	pkgver = 61.0a1.20180314
+	pkgver = 63.0a1.20180721
 	pkgrel = 1
 	url = https://www.mozilla.org/es-ES/firefox/nightly
 	arch = i686
@@ -15,7 +15,6 @@ pkgbase = firefox-nightly-es-es
 	depends = mime-types
 	optdepends = pulseaudio: audio support
 	optdepends = ffmpeg: h.264 video
-	optdepends = gtk2: flash plugin support
 	optdepends = hunspell: spell checking
 	optdepends = hyphen: hyphenation
 	optdepends = libnotify: notification integration
@@ -24,19 +23,19 @@ pkgbase = firefox-nightly-es-es
 	optdepends = startup-notification: support for FreeDesktop Startup Notification
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
-	source = vendor.js
+	source = policies.json
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha512sums = b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095
-	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
-	source_i686 = 20180314-firefox-61.0a1.es-ES.linux-i686.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-61.0a1.es-ES.linux-i686.tar.bz2
-	source_i686 = 20180314-firefox-61.0a1.es-ES.linux-i686.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-61.0a1.es-ES.linux-i686.tar.bz2.asc
-	source_i686 = 20180314-firefox-61.0a1.es-ES.linux-i686.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-61.0a1.en-US.linux-i686.txt
+	sha512sums = 42426e7b510bd88cbf7b246bf66d7768afa5d71389bf15f7a4231dc24f99fd73284dd9a0a8eb4342b42337c2c7dd843e570a93afa7d3b44c97ecbf5e38e433ac
+	sha512sums = 59d53a3f225e4e28ea25459dba0f3eb96b0e896a96bee992fd45148de3276e141649a0db7e6abad7f4ad341ea244222d31d2ac943f6b7d63c2b7365f702e537c
+	source_i686 = 20180722-firefox-63.0a1.es-ES.linux-i686.tar.bz2::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-63.0a1.es-ES.linux-i686.tar.bz2
+	source_i686 = 20180722-firefox-63.0a1.es-ES.linux-i686.tar.bz2.asc::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-63.0a1.es-ES.linux-i686.tar.bz2.asc
+	source_i686 = 20180722-firefox-63.0a1.es-ES.linux-i686.txt::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central/firefox-63.0a1.en-US.linux-i686.txt
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
-	source_x86_64 = 20180314-firefox-61.0a1.es-ES.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-61.0a1.es-ES.linux-x86_64.tar.bz2
-	source_x86_64 = 20180314-firefox-61.0a1.es-ES.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-61.0a1.es-ES.linux-x86_64.tar.bz2.asc
-	source_x86_64 = 20180314-firefox-61.0a1.es-ES.linux-x86_64.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-61.0a1.en-US.linux-x86_64.txt
+	source_x86_64 = 20180722-firefox-63.0a1.es-ES.linux-x86_64.tar.bz2::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-63.0a1.es-ES.linux-x86_64.tar.bz2
+	source_x86_64 = 20180722-firefox-63.0a1.es-ES.linux-x86_64.tar.bz2.asc::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-63.0a1.es-ES.linux-x86_64.tar.bz2.asc
+	source_x86_64 = 20180722-firefox-63.0a1.es-ES.linux-x86_64.txt::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central/firefox-63.0a1.en-US.linux-x86_64.txt
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 27bf54698af5..c32b99231434 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,4 @@
-# Maintainer: Iván Ruvalcaba <mario.i.ruvalcaba[at]gmail[dot]com>
-# Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani@gmail.com>
-# Contributor: Cedric MATHIEU <me.xenom @ gmail.com>
+# Maintainer: Akrai <drokergeek@gmail.com>
 
 # Before you complain about unverifiable signature, please read Allan's post:
 # http://allanmcrae.com/2015/01/two-pgp-keyrings-for-package-management-in-arch-linux/
@@ -14,8 +12,8 @@ _pkgname=${_name}-${_channel}
 pkgname=${_pkgname}-${_lang,,}
 pkgdesc="Standalone Web Browser from Mozilla — Nightly build (${_lang})"
 url="https://www.mozilla.org/${_lang}/${_name}/${_channel}"
-_version=61.0a1
-pkgver=61.0a1.20180314
+_version=63.0a1
+pkgver=63.0a1.20180721
 pkgrel=1
 arch=('i686' 'x86_64')
 conflicts=('firefox-nightly')
@@ -23,19 +21,18 @@ license=('MPL' 'GPL' 'LGPL')
 depends=('dbus-glib' 'gtk3' 'libxt' 'nss' 'mime-types')
 optdepends=('pulseaudio: audio support'
             'ffmpeg: h.264 video'
-            'gtk2: flash plugin support'
             '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')
-_url="https://ftp.mozilla.org/pub/${_name}/nightly/latest-mozilla-central"
+_url="https://download-installer.cdn.mozilla.net/pub/${_name}/nightly/latest-mozilla-central"
 _urlsrc="${_url}-l10n"
 _src="${_name}-${_version}.${_lang}.linux"
 _srctxt="${_name}-${_version}.en-US.linux"
 _filename="$(date +%Y%m%d)-${_src}"
-source=("${_pkgname}.desktop" 'vendor.js')
+source=("${_pkgname}.desktop" 'policies.json')
 source_i686=("${_filename}-i686.tar.bz2"::"${_urlsrc}/${_src}-i686.tar.bz2"
              "${_filename}-i686.tar.bz2.asc"::"${_urlsrc}/${_src}-i686.tar.bz2.asc"
              "${_filename}-i686.txt"::"${_url}/${_srctxt}-i686.txt")
@@ -43,8 +40,8 @@ source_x86_64=("${_filename}-x86_64.tar.bz2"::"${_urlsrc}/${_src}-x86_64.tar.bz2
                "${_filename}-x86_64.tar.bz2.asc"::"${_urlsrc}/${_src}-x86_64.tar.bz2.asc"
                "${_filename}-x86_64.txt"::"${_url}/${_srctxt}-x86_64.txt")
 sha512sums=(
-    'b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095'
-    'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
+    '42426e7b510bd88cbf7b246bf66d7768afa5d71389bf15f7a4231dc24f99fd73284dd9a0a8eb4342b42337c2c7dd843e570a93afa7d3b44c97ecbf5e38e433ac'
+    '59d53a3f225e4e28ea25459dba0f3eb96b0e896a96bee992fd45148de3276e141649a0db7e6abad7f4ad341ea244222d31d2ac943f6b7d63c2b7365f702e537c'
 )
 sha512sums_i686=('SKIP' 'SKIP' 'SKIP')
 sha512sums_x86_64=('SKIP' 'SKIP' 'SKIP')
@@ -63,30 +60,24 @@ package() {
   ln -s "/${OPT_PATH}/${_name}" "${pkgdir}"/usr/bin/${_pkgname}
 
   # Install .desktop files
-  install -Dm644 "${srcdir}"/${_pkgname}.desktop -t \
-    "${pkgdir}"/usr/share/applications
+  install -Dm644 "${srcdir}"/${_pkgname}.desktop -t "${pkgdir}"/usr/share/applications
 
   # Install icons
   SRC_LOC="${srcdir}"/${_name}/browser
   DEST_LOC="${pkgdir}"/usr/share/icons/hicolor
-
-  for i in 16 32 48
+  for i in 16 32 48 64 128
   do
-    install -Dm644 "${SRC_LOC}"/chrome/icons/default/default${i}.png \
-      "${DEST_LOC}"/${i}x${i}/apps/${_pkgname}.png
+      install -Dm644 "${SRC_LOC}"/chrome/icons/default/default${i}.png "${DEST_LOC}"/${i}x${i}/apps/${_pkgname}.png
   done
 
   #install -Dm644 "${SRC_LOC}"/icons/mozicon128.png \
   #  "${DEST_LOC}"/128x128/apps/${_pkgname}.png
 
   # Disable auto-updates
-  install -Dm644 "${srcdir}"/vendor.js -t \
-    "${pkgdir}"/${OPT_PATH}/browser/defaults/preferences
+  install -Dm644 "${srcdir}"/policies.json -t "${pkgdir}"/${OPT_PATH}/distribution
 
   # Use system-provided dictionaries
   rm -rf "${pkgdir}"/${OPT_PATH}/{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell "${pkgdir}"/${OPT_PATH}/dictionaries
   ln -sf /usr/share/hyphen "${pkgdir}"/${OPT_PATH}/hyphenation
 }
-
-# vim:set ts=2 sw=2 cc=80 et:
diff --git a/firefox-nightly.desktop b/firefox-nightly.desktop
index 96d7cf943027..9becb1d2c641 100644
--- a/firefox-nightly.desktop
+++ b/firefox-nightly.desktop
@@ -82,16 +82,17 @@ Comment[uk]=Перегляд сторінок Інтернету
 Comment[vi]=Để duyệt các trang web
 Comment[zh_CN]=浏览互联网
 Comment[zh_TW]=瀏覽網際網路
-Exec=firefox-nightly --class=FirefoxNightly %u
+Exec=/opt/firefox-nightly/firefox %u
 Icon=firefox-nightly
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true
-StartupWMClass=FirefoxNightly
+StartupWMClass=Nightly
 Categories=Network;WebBrowser;
 Keywords=web;browser;internet;
 Actions=new-window;new-private-window;
+
 [Desktop Action new-window]
 Name=New Window
 Name[ach]=Dirica manyen
@@ -198,7 +199,7 @@ Name[wo]=Palanteer bu bees
 Name[xh]=Ifestile entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
-Exec=firefox-nightly --class=FirefoxNightly --new-window %u
+Exec=/opt/firefox-nightly/firefox --new-window %u
 
 [Desktop Action new-private-window]
 Name=New Private Window
@@ -306,4 +307,4 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
-Exec=firefox-nightly --class=FirefoxNightly --private-window %u
+Exec=/opt/firefox-nightly/firefox --private-window %u
diff --git a/policies.json b/policies.json
new file mode 100644
index 000000000000..204d30869179
--- /dev/null
+++ b/policies.json
@@ -0,0 +1 @@
+{ "policies": { "DisableAppUpdate": true } }