Allow side-by-side installation with tdesktop

3 files changed, 37 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe28e64ddd93..bf3611f97064 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 64gram-desktop
 	pkgdesc = Unofficial desktop version of Telegram messaging app
 	pkgver = 1.0.42
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/TDesktop-x64/tdesktop
 	arch = x86_64
@@ -40,14 +40,13 @@ pkgbase = 64gram-desktop
 	depends = libdispatch
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
-	conflicts = telegram-desktop
-	conflicts = tdesktop-x64
-	replaces = tdesktop-x64
 	source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.0.42/64Gram-1.0.42-full.tar.gz
 	source = block-sponsored_messages.patch
 	source = fix-tgcalls-cstdint.patch
+	source = 64gramdesktop.desktop
 	sha512sums = a8501d780cbbbe19d28ffbff05ee329a0786b5bf18e806ed3ae66808d08fc8707eff99b05ccfe228b42be69a1724c90a90fd9934fc9b2179392d58c74ee1a69d
 	sha512sums = c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae
 	sha512sums = 7b66b1dc928c9107a5f47ba8782eec0f811fe5988449afcb24e1e15cbc7c4c3e284d0480e272a4ba7a15d4acc374cae72ba3caa382cc9e67dd23c7ed6bad0e8c
+	sha512sums = a24fd473835d808da987ebf1433b16273debb7a85304e3ef7ea2eadae949051a4a800a40ca76b73febbb9e66901c324bdda7a33d1bac894271af82975a8bb428
 
 pkgname = 64gram-desktop
diff --git a/64gramdesktop.desktop b/64gramdesktop.desktop
new file mode 100644
index 000000000000..08be2c420045
--- /dev/null
+++ b/64gramdesktop.desktop
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Version=1.5
+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;
+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
diff --git a/PKGBUILD b/PKGBUILD
index 3c157568598b..7602cc7a2e48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=64gram-desktop
 _pkgname=64Gram
 pkgver=1.0.42
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Unofficial desktop version of Telegram messaging app'
 arch=('x86_64')
@@ -18,15 +18,14 @@ optdepends=('webkit2gtk: embedded browser features'
             'xdg-desktop-portal: desktop integration')
 source=("https://github.com/TDesktop-x64/tdesktop/releases/download/v${pkgver}/${_pkgname}-${pkgver}-full.tar.gz"
         "block-sponsored_messages.patch"
-        "fix-tgcalls-cstdint.patch")
+        "fix-tgcalls-cstdint.patch"
+        "64gramdesktop.desktop")
 sha512sums=('a8501d780cbbbe19d28ffbff05ee329a0786b5bf18e806ed3ae66808d08fc8707eff99b05ccfe228b42be69a1724c90a90fd9934fc9b2179392d58c74ee1a69d'
             'c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae'
-            '7b66b1dc928c9107a5f47ba8782eec0f811fe5988449afcb24e1e15cbc7c4c3e284d0480e272a4ba7a15d4acc374cae72ba3caa382cc9e67dd23c7ed6bad0e8c')
-conflicts=("telegram-desktop" "tdesktop-x64")
-replaces=("tdesktop-x64")
+            '7b66b1dc928c9107a5f47ba8782eec0f811fe5988449afcb24e1e15cbc7c4c3e284d0480e272a4ba7a15d4acc374cae72ba3caa382cc9e67dd23c7ed6bad0e8c'
+            'a24fd473835d808da987ebf1433b16273debb7a85304e3ef7ea2eadae949051a4a800a40ca76b73febbb9e66901c324bdda7a33d1bac894271af82975a8bb428')
 prepare() {
     cd $_pkgname-$pkgver-full
-    sed -i '/option(DESKTOP_APP_DISABLE_AUTOUPDATE/s/^# //' cmake/variables.cmake
     patch -Np1 --binary -i ../block-sponsored_messages.patch
     patch -Np1 --binary -i "$srcdir"/fix-tgcalls-cstdint.patch -d Telegram/ThirdParty/tgcalls
 }
@@ -34,13 +33,14 @@ prepare() {
 build() {
     cd $_pkgname-$pkgver-full
     export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
-    cmake . \
+    cmake \
         -B build \
         -G Ninja \
         -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_BUILD_TYPE=Release \
         -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
-        -DTDESKTOP_API_TEST=ON
+        -DTDESKTOP_API_TEST=ON \
+        -DTDESKTOP_LAUNCHER_BASENAME=64gramdesktop
     sed -i '/LINK_LIBRARIES/s/$/ \/usr\/lib\/liblzma.so/' build/build.ninja
     ninja -C build
 }
@@ -48,4 +48,8 @@ build() {
 package() {
     cd $_pkgname-$pkgver-full
     DESTDIR=$pkgdir ninja -C build install
+    mv "$pkgdir/usr/bin/telegram-desktop" "$pkgdir/usr/bin/64gram-desktop"
+    install -Dm644 "$srcdir/64gramdesktop.desktop" -t "$pkgdir/usr/share/applications"
+    find "$pkgdir" -type f -name "telegram.png" -exec rename telegram.png 64gram.png {} \;
+    install -Dm644 /dev/null "$pkgdir/etc/tdesktop/externalupdater"
 }