Upgrade to v1.2.3.0, switch to license from Hiri servers, small refactors to PKGBUILD/Desktop files

4 files changed, 33 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3af128ad8eda..5696a8c75b9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hiri
-	pkgdesc = An Exchange ready mail client aiming to replace Outlook (QT5)
-	pkgver = 1.0.7.0
+	pkgdesc = A cross-platform, Exchange-ready email client aiming to replace Outlook
+	pkgver = 1.2.3.0
 	pkgrel = 1
 	url = https://www.hiri.com/
 	install = hiri.install
@@ -9,13 +9,15 @@ pkgbase = hiri
 	depends = python-pyqt5
 	depends = qt5-webkit
 	depends = python-pyenchant
-	source = https://feedback.hiri.com/downloads/Hiri-x86_64-1.0.7.0.tar.gz
+	provides = hiri
+	conflicts = hiri
+	source = https://feedback.hiri.com/dist/downloads/Hiri-x86_64-1.2.3.0.tar.gz
+	source = https://feedback.hiri.com/dist/downloads/license.txt
 	source = hiri.desktop
-	source = Hiri-EULA
 	source = hiri.sh
-	sha512sums = 4696b1fb777d66d66110b4612dc74f8491d9ebd868ae8c713cc04dd4ce05854a52349c32f8c22fec4578a8d6ac3e4243c1b75efba7a83812c4b66587a11e334b
-	sha512sums = 5afa589faa4d31419f74650d2d7735c430d236d5fe264b000154eeaeface527547db8816a45485e7d144a3151e8d5edc847fe2b5e2eb7f447ae91285064afb7d
-	sha512sums = c1640c1a3430418a72cbaa169c790a18f0571613c1c4791f8c4c12289bbc10ca361bb322baa79a1b183411bc378f7e51ed235ef49f6ace0aab92367321444b81
+	sha512sums = 3b080f78f74ffccaebfc6719b9f23ef542f4bc4ac0dba48c01f44697323600cb284c0774356f07cd9d61cd28127422eed5abc111e1e9f5422846aff3115cff26
+	sha512sums = ae8274026cb1b68f9b3f4cb66348952e19e31d477602a3d6d529121010260727824d0a060303e10fa8c5661f0b336ceabb0b472ad1cb74835ff5d6f3d3d53636
+	sha512sums = cc50dc92bd28bb3178a857b436d0958077b1f6ede643a65cd5d6b900dc05d6b73f04ea1fe76af6298841bffb08f8d4fd94796b9511feeeaf2f3de8a6e163304c
 	sha512sums = cafbf1f327618cb1d8914babf9cc9c2013b5db27df2a463329f9d366952c5ee592e946e727f991c8f7f558bdf7e625b91e0e029fa193650c197c6c9c6a57676d
 
 pkgname = hiri
diff --git a/Hiri-EULA b/Hiri-EULA
deleted file mode 100644
index c5918ec34521..000000000000
--- a/Hiri-EULA
+++ /dev/null
@@ -1,25 +0,0 @@
-Terms of service
-
-Terms of Use ("Terms"): Please read these Terms of Use ("Terms", "Terms of Use") carefully before using the Hiri application, hiri.com, RateMyMail or Email Academy (collectively referred to as the "Service") operated by Whittl Media Ltd ("us", "we", or "our"), trading has Hiri.
-
-Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms. These Terms apply to all visitors, users and others who access or use the Service.
-
-By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you may not access the Service.
-
-Intellectual Property: The Service and its original content, features and functionality are and will remain the exclusive property of Whittl Media Ltd and its licensors. The Service is protected by copyright, trademark, and other laws of both the Ireland and foreign countries. Our trademarks and trade dress may not be used in connection with any product or service without the prior written consent of Whittl Media Ltd.
-
-Termination: We may terminate or suspend your access immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms. Upon termination, your right to use the Service will immediately cease.
-
-Limitation Of Liability: In no event shall Whittl Media Ltd, nor its directors, employees, partners, agents, suppliers, or affiliates, be liable for any indirect, incidental, special, consequential or punitive damages, including without limitation, loss of profits, data, use, goodwill, or other intangible losses, resulting from (i) your access to or use of or inability to access or use the Service; (ii) any conduct or content of any third party on the Service; (iii) any content obtained from the Service; and (iv) unauthorized access, use or alteration of your transmissions or content, whether based on warranty, contract, tort (including negligence) or any other legal theory, whether or not we have been informed of the possibility of such damage, and even if a remedy set forth herein is found to have failed of its essential purpose.
-
-Disclaimer: Your use of the Service is at your sole risk. The Service is provided on an "AS IS" and "AS AVAILABLE" basis. The Service is provided without warranties of any kind, whether express or implied, including, but not limited to, implied warranties of merchantability, fitness for a particular purpose, non-infringement or course of performance.
-
-Whittl Media Ltd its subsidiaries, affiliates, and its licensors do not warrant that a) the Service will function uninterrupted, secure or available at any particular time or location; b) any errors or defects will be corrected; c) the Service is free of viruses or other harmful components; or d) the results of using the Service will meet your requirements.
-
-Governing Law: These Terms shall be governed and construed in accordance with the laws of Ireland, without regard to its conflict of law provisions.
-
-Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions of these Terms will remain in effect. These Terms constitute the entire agreement between us regarding our Service, and supersede and replace any prior agreements we might have between us regarding the Service.
-
-Changes: We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will try to provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.
-
-By continuing to access or use our Service after those revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, please stop using the Service. 
diff --git a/PKGBUILD b/PKGBUILD
index c972033f87fb..c0e2d04b5260 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,34 @@
-# Maintainer: Muratcan Sisek <mail@muratcansimsek.com.tr>
+# Maintainer: Alex Tharp <toastercup@gmail.com>
+# Original Maintainer: Muratcan Sisek <mail@muratcansimsek.com.tr>
 pkgname=hiri
-pkgver=1.0.7.0
+pkgver=1.2.3.0
 pkgrel=1
-pkgdesc="An Exchange ready mail client aiming to replace Outlook (QT5)"
+pkgdesc="A cross-platform, Exchange-ready email client aiming to replace Outlook"
 arch=('x86_64')
 url="https://www.hiri.com/"
 license=('custom')
+provides=('hiri')
+conflicts=('hiri')
 depends=('python-pyqt5'
-	 'qt5-webkit'
-	 'python-pyenchant')
+         'qt5-webkit'
+         'python-pyenchant')
 install=$pkgname.install
-source=('https://feedback.hiri.com/downloads/Hiri-'$arch'-'$pkgver'.tar.gz'
-	'hiri.desktop'
-	'Hiri-EULA'
-	'hiri.sh')
-sha512sums=('4696b1fb777d66d66110b4612dc74f8491d9ebd868ae8c713cc04dd4ce05854a52349c32f8c22fec4578a8d6ac3e4243c1b75efba7a83812c4b66587a11e334b'
-            '5afa589faa4d31419f74650d2d7735c430d236d5fe264b000154eeaeface527547db8816a45485e7d144a3151e8d5edc847fe2b5e2eb7f447ae91285064afb7d'
-            'c1640c1a3430418a72cbaa169c790a18f0571613c1c4791f8c4c12289bbc10ca361bb322baa79a1b183411bc378f7e51ed235ef49f6ace0aab92367321444b81'
+source=('https://feedback.hiri.com/dist/downloads/Hiri-'$arch'-'$pkgver'.tar.gz'
+        'https://feedback.hiri.com/dist/downloads/license.txt'
+        'hiri.desktop'
+        'hiri.sh')
+sha512sums=('3b080f78f74ffccaebfc6719b9f23ef542f4bc4ac0dba48c01f44697323600cb284c0774356f07cd9d61cd28127422eed5abc111e1e9f5422846aff3115cff26'
+            'ae8274026cb1b68f9b3f4cb66348952e19e31d477602a3d6d529121010260727824d0a060303e10fa8c5661f0b336ceabb0b472ad1cb74835ff5d6f3d3d53636'
+            'cc50dc92bd28bb3178a857b436d0958077b1f6ede643a65cd5d6b900dc05d6b73f04ea1fe76af6298841bffb08f8d4fd94796b9511feeeaf2f3de8a6e163304c'
             'cafbf1f327618cb1d8914babf9cc9c2013b5db27df2a463329f9d366952c5ee592e946e727f991c8f7f558bdf7e625b91e0e029fa193650c197c6c9c6a57676d')
 
 build () {
-	cd hiri
-	cp /usr/lib/python3.6/lib-dynload/_ssl.cpython-36m-x86_64-linux-gnu.so _ssl.cpython-36m-x86_64-linux-gnu.so
-
+  cd hiri_"$pkgver"
 }
+
 package() {
   install -d "$pkgdir"/opt
-  cp -rup "hiri" "$pkgdir"/opt/$pkgname
+  cp -rup "hiri_$pkgver" "$pkgdir"/opt/$pkgname
 
   install -d "$pkgdir"/usr/bin
   ln -s /opt/$pkgname/hiri.sh  "$pkgdir"/usr/bin/hiri
@@ -38,6 +40,5 @@ package() {
   install -d "$pkgdir"/usr/share/icons/hicolor/128x128/apps
   ln -s /opt/$pkgname/hiri.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/$pkgname.png
 
-  install -Dm644 Hiri-EULA "$pkgdir"/usr/share/licenses/$pkgname/EULA
-   
+  install -Dm644 license.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/hiri.desktop b/hiri.desktop
index 9b61a0e388b8..bb92075427e7 100644
--- a/hiri.desktop
+++ b/hiri.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Version=1.0
 Type=Application
 Name=Hiri
-Comment=Hiri email client
-Categories=Network;Office;
+Comment=Exchange email client
+Categories=Network;Office;Email;Calendar;ContactManagement;
 Terminal=false
-Exec="/opt/hiri/hiri.sh"
-Icon=/opt/hiri/hiri.png
\ No newline at end of file
+StartupNotify=true
+Exec=/opt/hiri/hiri.sh %u
+Icon=/opt/hiri/hiri.png