Upstream 1.7.0

3 files changed, 19 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83a622de23c4..ba633865394d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = birdtray
 	pkgdesc = Run Thunderbird with a system tray icon.
-	pkgver = 1.6
+	pkgver = 1.7.0
 	pkgrel = 1
 	url = https://github.com/gyunaev/birdtray
 	arch = i686
@@ -8,13 +8,13 @@ pkgbase = birdtray
 	arch = armv7h
 	arch = armv6h
 	arch = aarch64
-	license = GPL
+	license = GPL-3.0
+	makedepends = cmake
+	makedepends = qt5-tools
 	depends = qt5-x11extras
 	depends = sqlite3
-	source = birdtray-1.6.tar.gz::https://github.com/gyunaev/birdtray/archive/2ad1a944dcd084ff1ea874b94d07be2bb8a77c18.tar.gz
-	source = birdtray.desktop
-	sha1sums = 6996de307b48627df9b40c7dedef6a7e34e7cec7
-	sha1sums = f3398822d8cf6671f06b5e065b623083294d6f11
+	source = birdtray-1.7.0.tar.gz::https://github.com/gyunaev/birdtray/archive/RELEASE_1.7.0.tar.gz
+	sha1sums = a11cc398b8f1aa0e4c5d5ae50c0cd87d6d1b6a2a
 
 pkgname = birdtray
 
diff --git a/PKGBUILD b/PKGBUILD
index eef84d44a4a4..74019a94a913 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,29 @@
 # Maintainer: Jonathon Fernyhough <jonathon_at_manjaro dot+org>
-# Contributor: Valentin Huélamo (birdtray.desktop)
+# Contributor: Valentin Huélamo (birdtray.desktop, now upstreamed)
+# Contributor: Kr1ss <kr1ss.x#yandex#com> (cmake)
 
 pkgname=birdtray
-pkgver=1.6
-_commit=2ad1a944dcd084ff1ea874b94d07be2bb8a77c18
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Run Thunderbird with a system tray icon."
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/gyunaev/birdtray"
-license=('GPL')
+license=('GPL-3.0')
 depends=(qt5-x11extras sqlite3)
-source=("${pkgname}-${pkgver}.tar.gz::$url/archive/${_commit}.tar.gz"
-        birdtray.desktop)
-sha1sums=('6996de307b48627df9b40c7dedef6a7e34e7cec7'
-          'f3398822d8cf6671f06b5e065b623083294d6f11')
+makedepends=(cmake qt5-tools)
+source=("${pkgname}-${pkgver}.tar.gz::$url/archive/RELEASE_${pkgver}.tar.gz")
+sha1sums=('a11cc398b8f1aa0e4c5d5ae50c0cd87d6d1b6a2a')
 
 build() {
   mkdir -p build && cd build
-  qmake-qt5 ../$pkgname-$_commit/src
+  cmake ../$pkgname-RELEASE_$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  install -d "$pkgdir"/usr/bin
-  install -d "$pkgdir"/usr/lib/birdtray
-  install -d "$pkgdir"/usr/include/birdtray
-  install -d "$pkgdir"/usr/share/applications
-
-  install birdtray.desktop "$pkgdir"/usr/share/applications/birdtray.desktop
-  install build/birdtray   "$pkgdir"/usr/bin/birdtray
-  install -m644 build/*.o  "$pkgdir"/usr/lib/birdtray/
-  install -m644 build/*.h  "$pkgdir"/usr/include/birdtray/
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../$pkgname-RELEASE_$pkgver/README.md -t"$pkgdir/usr/share/doc/$pkgname/"
 }
diff --git a/birdtray.desktop b/birdtray.desktop
deleted file mode 100644
index 3f486a806aee..000000000000
--- a/birdtray.desktop
+++ /dev/null
@@ -1,32 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Birdtray
-Keywords=Email;E-mail;Newsgroup;Feed;RSS
-Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS
-Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS
-Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS
-Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS
-Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben
-Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα
-Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS
-Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte
-Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Thunderbird;Lire;Écrire
-Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל;
-Keywords[hr]=email;e-mail;e-pošta;pošta;RSS
-Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS
-Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS
-Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS
-Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Mozilla
-Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post
-Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды
-Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS
-Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка
-Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư
-Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Thunderbird;tb;雷鸟;电邮;邮箱;阅读器;
-Exec=birdtray
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=thunderbird
-Categories=Application;Network;Email;
-StartupNotify=true