From d5c876b66a4a0b1ef23acc0e2a77ab8a21f4b1a9 Mon Sep 17 00:00:00 2001
From: Cedric Girard <girard.cedric@gmail.com>
Date: Mon, 15 Jun 2015 12:08:27 +0200
Subject: [PATCH] thunderbird-nightly moved to AUR4 and submodule

---
 .gitmodules                                   |  4 ++
 pkgbuild/thunderbird-nightly                  |  1 +
 pkgbuild/thunderbird-nightly/PKGBUILD         | 51 -------------------
 .../thunderbird-nightly.desktop               | 13 -----
 .../thunderbird-nightly.install               | 16 ------
 pkgbuild/thunderbird-nightly/vendor.js        |  9 ----
 6 files changed, 5 insertions(+), 89 deletions(-)
 create mode 160000 pkgbuild/thunderbird-nightly
 delete mode 100644 pkgbuild/thunderbird-nightly/PKGBUILD
 delete mode 100644 pkgbuild/thunderbird-nightly/thunderbird-nightly.desktop
 delete mode 100644 pkgbuild/thunderbird-nightly/thunderbird-nightly.install
 delete mode 100644 pkgbuild/thunderbird-nightly/vendor.js

diff --git a/.gitmodules b/.gitmodules
index 77538e1..d010b77 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,3 +38,7 @@
 	path = pkgbuild/mmv
 	url = https://aur@aur4.archlinux.org/mmv.git
 	pushurl = ssh+git://aur@aur4.archlinux.org/mmv.git
+[submodule "pkgbuild/thunderbird-nightly"]
+	path = pkgbuild/thunderbird-nightly
+	url = https://aur@aur4.archlinux.org/thunderbird-nightly.git
+	pushurl = ssh+git://aur@aur4.archlinux.org/thunderbird-nightly.git
diff --git a/pkgbuild/thunderbird-nightly b/pkgbuild/thunderbird-nightly
new file mode 160000
index 0000000..c8914eb
--- /dev/null
+++ b/pkgbuild/thunderbird-nightly
@@ -0,0 +1 @@
+Subproject commit c8914eb92de1296207674dfd8c9953d3206f9470
diff --git a/pkgbuild/thunderbird-nightly/PKGBUILD b/pkgbuild/thunderbird-nightly/PKGBUILD
deleted file mode 100644
index ba4f5b5..0000000
--- a/pkgbuild/thunderbird-nightly/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Cedric Girard <girard.cedric@gmail.com>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Based on [extra]'s thunderbird
-
-pkgname=thunderbird-nightly
-pkgver=41.0a1.20150518
-_version=41.0a1
-pkgrel=1
-pkgdesc="Standalone Mail/News reader - Nightly build"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-url="http://www.mozilla.org/thunderbird"
-depends=('alsa-lib' 'cairo' 'dbus-glib' 'desktop-file-utils' 'fontconfig' 'freetype2' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libjpeg' 'libmng' 'libpng' 'libvpx' 'libxt' 'mozilla-common' 'nspr' 'nss' 'shared-mime-info' 'sqlite' 'startup-notification')
-optdepends=('libcanberra: for sound support')
-provides=("thunderbird=$_version")
-install=$pkgname.install
-source=($pkgname.desktop
-        vendor.js)
-sha1sums=('9373c6b8e57692f62bac9f738351407ff27aa6f3'
-          '4243393daf5bd5a68644034001f512178cad09cc')
-
-pkgver(){
-  FX_SRC="thunderbird-${_version}.en-US.linux-${CARCH}.txt"
-  FX_SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-comm-central/${FX_SRC}"
-  msg "Getting last nightly date..."
-  curl -ORz ${FX_SRC} ${FX_SRC_URI}
-  echo "${_version}.$(head -n1 ${FX_SRC} | cut -c -8)"
-
-}
-
-package() {
-  FX_SRC="thunderbird-${_version}.en-US.linux-${CARCH}.tar.bz2"
-  FX_SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-comm-central/${FX_SRC}"
-
-  msg "Downloading..."
-  curl -ORz ${FX_SRC} ${FX_SRC_URI}
-  msg "Extracting..."
-  bsdtar -x -f ${FX_SRC}
-  msg "Packaging..."
-
-  install -d "$pkgdir"/{usr/bin,opt}
-  cp -a thunderbird "$pkgdir/opt/$pkgname-$pkgver"
-  cp vendor.js "$pkgdir/opt/$pkgname-$pkgver/defaults/pref/"
-  ln -s /opt/$pkgname-$pkgver/thunderbird "$pkgdir/usr/bin/$pkgname"
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 thunderbird/chrome/icons/default/default${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png"
-  done
-  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  rm -rf "$pkgdir/opt/$pkgname-$pkgver/dictionaries/"
-  ln -sf /usr/share/hunspell/ "$pkgdir/opt/$pkgname-$pkgver/dictionaries"
-}
diff --git a/pkgbuild/thunderbird-nightly/thunderbird-nightly.desktop b/pkgbuild/thunderbird-nightly/thunderbird-nightly.desktop
deleted file mode 100644
index 97b3ca9..0000000
--- a/pkgbuild/thunderbird-nightly/thunderbird-nightly.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird (Nightly)
-Comment=Mail & News Reader (Nightly)
-GenericName=Mail Client & News Reader (Nightly)
-Exec=thunderbird-nightly %u
-TryExec=thunderbird-nightly
-Icon=thunderbird-nightly
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
\ No newline at end of file
diff --git a/pkgbuild/thunderbird-nightly/thunderbird-nightly.install b/pkgbuild/thunderbird-nightly/thunderbird-nightly.install
deleted file mode 100644
index 7c62260..0000000
--- a/pkgbuild/thunderbird-nightly/thunderbird-nightly.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    echo ""
-    echo "Note: the binary is called 'thunderbird-nightly'"
-    echo ""
-}
-
-post_upgrade() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    post_upgrade
-}
\ No newline at end of file
diff --git a/pkgbuild/thunderbird-nightly/vendor.js b/pkgbuild/thunderbird-nightly/vendor.js
deleted file mode 100644
index 170b505..0000000
--- a/pkgbuild/thunderbird-nightly/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);