Clean a bit, remove Hello and Pocket by default

2 files changed, 26 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9df1e69e9bc0..7bc9ccc9d596 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,6 @@ pkgbase = firefox-nightly-fr
 	license = LGPL
 	depends = alsa-lib
 	depends = dbus-glib
-	depends = desktop-file-utils
 	depends = gtk2
 	depends = gtk3
 	depends = libxt
diff --git a/PKGBUILD b/PKGBUILD
index 295bcfa4aa93..206f421fce86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,20 @@
 # Maintainer: Anthony25 <anthony.ruhier @ gmail.com>
-# Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani at gmail dot com>
-# Contributor: Glorfindel <glorfindelATsentDOTcom>
-# Contributor: Brizou <brizou @ gmail.com>
-# Contributor: Cedric MATHIEU <me.xenom @ gmail.com>
-# Contributor: Det <nimetonmaili @ gmail.com>
-# Contributor: coderoar <coderoar @ gmail.com>
-# Contributor: kang <kang @ mozilla.com>
+# Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani @ gmail.com>
 # Thanks to @xenom, contributor of firefox-nightly
 
 _name=firefox
 _channel=nightly
 _lang=fr
 _full_name=${_name}-${_channel}
-pkgname=firefox-nightly-fr
-pkgdesc='Standalone Web Browser from Mozilla — Nightly build (fr)'
-url='https://nightly.mozilla.org/'
-_version="49.0a1"
+pkgname=${_full_name}-${_lang}
+pkgdesc="Standalone Web Browser from Mozilla — Nightly build (${_lang})"
+url="https://nightly.mozilla.org/"
+_version='49.0a1'
 pkgver=49.0a1.20160517
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'libxt'
-         'nss' 'mime-types')
+depends=('alsa-lib' 'dbus-glib' 'gtk2' 'gtk3' 'libxt' 'nss' 'mime-types')
 optdepends=('ffmpeg: h.264 video'
             'hunspell: spell checking'
             'hyphen: hyphenation')
@@ -30,22 +23,22 @@ _url_l10n="${_url}-l10n"
 _src="${_name}-${_version}.${_lang}.linux"
 _file_i686="${_src}-i686.tar.bz2"
 _file_x86_64="${_src}-x86_64.tar.bz2"
-_sums_i686="${_src}-i686.checksums"
-_sums_x86_64="${_src}-x86_64.checksums"
+_sums_i686="${_url_l10n}/${_src}-i686.checksums"
+_sums_x86_64="${_url_l10n}/${_src}-x86_64.checksums"
 source=(
     'firefox-nightly.desktop'
     'firefox-nightly-safe.desktop'
     'vendor.js'
 )
-source_i686=("${_url_l10n}/${_file_i686}" "${_url_l10n}/${_sums_i686}"{,.asc})
-source_x86_64=("${_url_l10n}/${_file_x86_64}" "${_url_l10n}/${_sums_x86_64}"{,.asc})
+source_i686=("${_url_l10n}/${_file_i686}" "${_sums_i686}"{,.asc})
+source_x86_64=("${_url_l10n}/${_file_x86_64}" "${_sums_x86_64}"{,.asc})
 sha512sums=(
     '725babc1365e02a30f50aafbc069b04a97cd247f76240b99b0a734dcce0e560f30cfd441efe9b0b9edcc48f327c8adad34e1ae45c2ba047205c84921d5e43e59'
     '2df6b84978ec459ffad3e0d285c816da07a890db30284d3b2bec250472c10e08003edf705278cb97e02a52fb5f1325d962c08d5fbcf98f484e982a97e381407b'
     'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
 )
-_srcsum_i686="$(curl -s "${_url_l10n}/${_sums_i686}" | grep "${_file_i686}" | grep sha512 | cut -d " " -f1)"
-_srcsum_x86_64="$(curl -s "${_url_l10n}/${_sums_x86_64}" | grep "${_file_x86_64}" | grep sha512 | cut -d " " -f1)"
+_srcsum_i686="$(curl -s "${_sums_i686}" | grep "${_file_i686}" | grep sha512 | cut -d " " -f1)"
+_srcsum_x86_64="$(curl -s "${_sums_x86_64}" | grep "${_file_x86_64}" | grep sha512 | cut -d " " -f1)"
 sha512sums_i686=("${_srcsum_i686}" 'SKIP' 'SKIP')
 sha512sums_x86_64=("${_srcsum_x86_64}" 'SKIP' 'SKIP')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla’s GnuPG release key
@@ -59,19 +52,27 @@ pkgver() {
 package() {
   OPT_PATH="/opt/${_name}-${_version}"
 
-  # uncomment this line to remove these
-  # rm -rf firefox/{extensions,plugins,searchplugins}
+  # Remove Loop (Firefox Hello) and GetPocket (Pocket proprietary service).
+  # Comment this line if you want to keep them.
+  rm -rf ${_name}/browser/features/{loop@mozilla.org.xpi,firefox@getpocket.com.xpi}
+
+  # Install the package files
   install -d "${pkgdir}"/{usr/{bin,share/applications},opt}
-  cp -r firefox "${pkgdir}/${OPT_PATH}"
-  ln -s "${OPT_PATH}/firefox" "${pkgdir}/usr/bin/${_full_name}"
+  cp -r ${_name} "${pkgdir}/${OPT_PATH}"
+  ln -s "${OPT_PATH}/${_name}" "${pkgdir}/usr/bin/${_full_name}"
 
+  # Install .desktop files
   install -m644 "${srcdir}"/{${_full_name}.desktop,${_full_name}-safe.desktop} "${pkgdir}/usr/share/applications/"
+
   # Install icons
+  SRC_LOC="${srcdir}/${_name}/browser"
+  DEST_LOC="${pkgdir}/usr/share/icons/hicolor"
   for i in 16 32 48
   do
-      install -Dm644 "${srcdir}/firefox/browser/chrome/icons/default/default${i}.png" "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_full_name}.png"
+      install -Dm644 "${SRC_LOC}/chrome/icons/default/default${i}.png" "${DEST_LOC}/${i}x${i}/apps/${_full_name}.png"
   done
-  install -Dm644 "${srcdir}/firefox/browser/icons/mozicon128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_full_name}.png"
+  install -Dm644 "${SRC_LOC}/icons/mozicon128.png" "${DEST_LOC}/128x128/apps/${_full_name}.png"
+
   # Disable auto-updates
   install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/${OPT_PATH}/browser/defaults/preferences/vendor.js"