updated to 4.0.0

3 files changed, 34 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d444c66e42b5..b833bba91c42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = android-messages-desktop-bin
 	pkgdesc = Android Messages as a cross-platform desktop app
-	pkgver = 3.1.0
-	pkgrel = 3
-	url = https://github.com/chrisknepper/android-messages-desktop
+	pkgver = 4.0.0
+	pkgrel = 1
+	url = https://github.com/OrangeDrangon/android-messages-desktop
 	arch = x86_64
 	license = MIT
 	depends = electron
@@ -10,12 +10,14 @@ pkgbase = android-messages-desktop-bin
 	depends = libappindicator-gtk3
 	provides = android-messages-desktop
 	conflicts = android-messages-desktop
-	source = https://github.com/chrisknepper/android-messages-desktop/releases/download/v3.1.0/android-messages-desktop-3.1.0.pacman
-	source = https://raw.githubusercontent.com/chrisknepper/android-messages-desktop/master/LICENSE
+	source = https://github.com/OrangeDrangon/android-messages-desktop/releases/download/v4.0.0/android-messages-desktop-4.0.0.pacman
+	source = https://github.com/OrangeDrangon/android-messages-desktop/raw/v4.0.0/LICENSE
 	source = android-messages-desktop
-	sha256sums = 97d5e7997ced8635e8fe46cefb0d95c979900e733570562d020d167ca348349a
-	sha256sums = 3a0332a1a4cbd1db232d73b032c3450c978e48759a3dbcfeddfb874e93bc0b3c
-	sha256sums = 006d50c067e21c9978890a2e8f27b86ba121e48992ef6814864188d704fca860
+	source = android-messages-desktop.desktop
+	sha256sums = aed2d8f5b78dd302dd21f867bda60c39a2321de1a36a4cbe698e616dfe08d920
+	sha256sums = 3ad8e115711a8eca0050f768179efdca0f978b195a9c4f856a9d805628d3886c
+	sha256sums = ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69
+	sha256sums = 1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a
 
 pkgname = android-messages-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 630a298e87c7..d51e9e6f0fc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,36 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 # Co-Maintainer: jswenson
-# Packager: Chris Knepper <chris82thekid at gmail dot com>
 pkgname=android-messages-desktop-bin
-pkgver=3.1.0
-pkgrel=3
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="Android Messages as a cross-platform desktop app"
 arch=('x86_64')
-url="https://github.com/chrisknepper/android-messages-desktop"
+#url="https://github.com/chrisknepper/android-messages-desktop"
+url="https://github.com/OrangeDrangon/android-messages-desktop"
 license=('MIT')
 depends=('electron' 'libnotify' 'libappindicator-gtk3')
 provides=("${pkgname%-bin}")
 conflicts=("${pkgname%-bin}")
 source=("$url/releases/download/v$pkgver/${pkgname%-bin}-$pkgver.pacman"
-		"https://raw.githubusercontent.com/chrisknepper/${pkgname%-bin}/master/LICENSE"
-		"${pkgname%-bin}")
-sha256sums=('97d5e7997ced8635e8fe46cefb0d95c979900e733570562d020d167ca348349a'
-            '3a0332a1a4cbd1db232d73b032c3450c978e48759a3dbcfeddfb874e93bc0b3c'
-            '006d50c067e21c9978890a2e8f27b86ba121e48992ef6814864188d704fca860')
-
-prepare() {
-	sed -i 's|"/opt/Android Messages/'${pkgname%-bin}'" %U|'${pkgname%-bin}'|g' \
-		"usr/share/applications/${pkgname%-bin}.desktop"
-}
+        "$url/raw/v$pkgver/LICENSE"
+        "${pkgname%-bin}"
+        "${pkgname%-bin}.desktop")
+sha256sums=('aed2d8f5b78dd302dd21f867bda60c39a2321de1a36a4cbe698e616dfe08d920'
+            '3ad8e115711a8eca0050f768179efdca0f978b195a9c4f856a9d805628d3886c'
+            'ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69'
+            '1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a')
 
 package() {
 	install -d "$pkgdir/usr/lib/${pkgname%-bin}"
-	cp -a "opt/Android Messages/resources" "$pkgdir/usr/lib/${pkgname%-bin}"
+	cp -a opt/AndroidMessages/resources "$pkgdir/usr/lib/${pkgname%-bin}"
 
 	install -Dm755 "${pkgname%-bin}" -t "$pkgdir/usr/bin"
-
-	install -Dm644 "usr/share/applications/${pkgname%-bin}.desktop" -t \
-		"$pkgdir/usr/share/applications"
+	install -Dm644 "${pkgname%-bin}.desktop" -t "$pkgdir/usr/share/applications"
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/${pkgname%-bin}"
 
 	for icon_size in 16 24 32 48 64 128 256 512 1024; do
 		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
 		install -d $pkgdir$icons_dir
-		install -m644 $srcdir$icons_dir/${pkgname%-bin}.png -t $pkgdir$icons_dir
+		install -m644 $srcdir$icons_dir/AndroidMessages.png $pkgdir$icons_dir/${pkgname%-bin}.png
 	done
-
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/${pkgname%-bin}"
 }
diff --git a/android-messages-desktop.desktop b/android-messages-desktop.desktop
new file mode 100644
index 000000000000..1f91f1fa2145
--- /dev/null
+++ b/android-messages-desktop.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Android Messages
+Exec=android-messages-desktop
+Terminal=false
+Type=Application
+Icon=android-messages-desktop
+StartupWMClass=Android Messages
+Comment=Messages for web, as a desktop app
+Categories=Internet;