made compatible with side-by-side installation of tdesktop

3 files changed, 38 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3a0470892ed..3806f39c69ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 64gram-desktop
 	pkgdesc = Unofficial desktop version of Telegram messaging app
 	pkgver = 1.1.5
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/TDesktop-x64/tdesktop
 	arch = x86_64
@@ -51,14 +51,14 @@ pkgbase = 64gram-desktop
 	depends = libxcomposite
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
-	provides = telegram-desktop
-	conflicts = telegram-desktop
 	noextract = 64Gram-1.1.5-full.tar.gz
 	source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.1.5/64Gram-1.1.5-full.tar.gz
 	source = block-sponsored_messages.patch
 	source = fix-lzma-link.patch
+	source = io.github.tdesktop_x64.TDesktop.desktop
 	sha512sums = 08fa80a83eef9a63378a505976e1f1c05d61a9ee3f24b2d65ccfb5f50aa5f56dc54a7e8b5bdfdca2c0f914beb34f23623744ec701326d531a247d17cd35bafb4
 	sha512sums = c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae
 	sha512sums = d813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463
+	sha512sums = ea027bc2d40c74507adf32380444207210a8c31cdba57f3f468d23d8e9c7376647cc8c713f188660f9b1dacd9041227aafd5a27c7889f47ea3985712b6b74b8b
 
 pkgname = 64gram-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 92f86b802142..1f9677bb99d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=64gram-desktop
 _pkgname=64Gram
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Unofficial desktop version of Telegram messaging app'
 arch=('x86_64')
@@ -20,15 +20,18 @@ makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-
              'gobject-introspection' 'boost' 'fmt' 'mm-common' 'perl-xml-parser')
 optdepends=('webkit2gtk: embedded browser features'
             'xdg-desktop-portal: desktop integration')
-provides=(telegram-desktop)
-conflicts=(telegram-desktop)
+
 source=("https://github.com/TDesktop-x64/tdesktop/releases/download/v${pkgver}/${_pkgname}-${pkgver}-full.tar.gz"
         "block-sponsored_messages.patch"
-        "fix-lzma-link.patch")
+        "fix-lzma-link.patch"
+        "io.github.tdesktop_x64.TDesktop.desktop")
+
 noextract=("${_pkgname}-${pkgver}-full.tar.gz")
+
 sha512sums=('08fa80a83eef9a63378a505976e1f1c05d61a9ee3f24b2d65ccfb5f50aa5f56dc54a7e8b5bdfdca2c0f914beb34f23623744ec701326d531a247d17cd35bafb4'
             'c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae'
-            'd813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463')
+            'd813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463'
+            'ea027bc2d40c74507adf32380444207210a8c31cdba57f3f468d23d8e9c7376647cc8c713f188660f9b1dacd9041227aafd5a27c7889f47ea3985712b6b74b8b')
 
 prepare() {
     LANG=C.UTF-8 bsdtar -xf ${_pkgname}-${pkgver}-full.tar.gz
@@ -54,5 +57,10 @@ build() {
 
 package() {
     DESTDIR="$pkgdir" cmake --install build
-    install -Dm644 /dev/null "$pkgdir/etc/tdesktop/externalupdater"
+    mv "$pkgdir/usr/bin/telegram-desktop" "$pkgdir/usr/bin/64gram-desktop"
+    install -Dm644 "$srcdir/io.github.tdesktop_x64.TDesktop.desktop" -t "$pkgdir/usr/share/applications"
+    find "$pkgdir" -type f -name "telegram.png" -exec rename telegram.png 64gram.png {} \;
+    mv "$pkgdir/usr/share/icons/hicolor/symbolic/apps/telegram-symbolic.svg" "$pkgdir/usr/share/icons/hicolor/symbolic/apps/64gram-symbolic.svg"
+    mkdir -p "$pkgdir/usr/share/64Gram/externalupdater.d"
+    echo "/usr/bin/64gram-desktop" >"$pkgdir/usr/share/64Gram/externalupdater.d/telegram-desktop.conf"
 }
diff --git a/io.github.tdesktop_x64.TDesktop.desktop b/io.github.tdesktop_x64.TDesktop.desktop
new file mode 100644
index 000000000000..3f81357944e4
--- /dev/null
+++ b/io.github.tdesktop_x64.TDesktop.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=64Gram Desktop
+Comment=Unofficial desktop version of Telegram messaging app
+TryExec=64gram-desktop
+Exec=64gram-desktop -- %u
+Icon=64gram
+Terminal=false
+StartupWMClass=64Gram
+Type=Application
+Categories=Chat;Network;InstantMessaging;Qt;
+MimeType=x-scheme-handler/tg;
+Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;64gram;
+Actions=quit;
+SingleMainWindow=true
+X-GNOME-UsesNotifications=true
+X-GNOME-SingleWindow=true
+
+[Desktop Action quit]
+Exec=64gram-desktop -quit
+Name=Quit Telegram
+Icon=application-exit