upgpkg: telegram-desktop-dev 1.9.8-1

- Version bump.
- PKGBUILD updates following original one.

2 files changed, 24 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec7a89f9fb49..9fc193205c9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-dev
 	pkgdesc = Official Telegram Desktop client - development release
-	pkgver = 1.9.4
+	pkgver = 1.9.8
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = i686
@@ -8,22 +8,21 @@ pkgbase = telegram-desktop-dev
 	license = GPL3
 	makedepends = cmake
 	makedepends = git
-	makedepends = libappindicator-gtk3
 	makedepends = python
 	makedepends = range-v3
 	depends = enchant
 	depends = ffmpeg
 	depends = hicolor-icon-theme
+	depends = libappindicator-gtk3
 	depends = lz4
 	depends = minizip
 	depends = openal
 	depends = qt5-imageformats
 	depends = xxhash
 	optdepends = ttf-opensans: default Open Sans font family
-	optdepends = libappindicator-gtk3: AppIndicator-based tray icon
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.9.4
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.9.8
 	source = Catch::git+https://github.com/philsquared/Catch
 	source = GSL::git+https://github.com/Microsoft/GSL.git
 	source = QR::git+https://github.com/nayuki/QR-Code-generator
@@ -46,8 +45,6 @@ pkgbase = telegram-desktop-dev
 	source = rlottie::git+https://github.com/desktop-app/rlottie.git
 	source = variant::git+https://github.com/mapbox/variant
 	source = xxHash::git+https://github.com/Cyan4973/xxHash.git
-	source = 0005-Use-system-wide-fonts.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/0005-Use-system-wide-fonts.patch?h=packages/telegram-desktop
-	source = 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch?h=packages/telegram-desktop
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -71,8 +68,6 @@ pkgbase = telegram-desktop-dev
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d
-	sha512sums = 41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d
 
 pkgname = telegram-desktop-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index 20f3945da086..e6eabdba4952 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,37 +6,22 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-dev
-pkgver=1.9.4
+pkgver=1.9.8
 pkgrel=1
 pkgdesc='Official Telegram Desktop client - development release'
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
-depends=(
-    'enchant'
-    'ffmpeg'
-    'hicolor-icon-theme'
-    'lz4'
-    'minizip'
-    'openal'
-    'qt5-imageformats'
-    'xxhash'
-)
-makedepends=(
-    'cmake'
-    'git'
-    'libappindicator-gtk3'
-    'python'
-    'range-v3'
-)
-optdepends=(
-    'ttf-opensans: default Open Sans font family'
-    'libappindicator-gtk3: AppIndicator-based tray icon'
-)
+depends=('enchant' 'ffmpeg' 'hicolor-icon-theme' 'libappindicator-gtk3'
+         'lz4' 'minizip' 'openal' 'qt5-imageformats' 'xxhash')
+makedepends=('cmake' 'git' 'python' 'range-v3')
+optdepends=('ttf-opensans: default Open Sans font family')
+
 provides=('telegram-desktop')
 conflicts=('telegram-desktop')
 _commit="tag=v$pkgver"
-#_commit="commit=46946c73236285649950071632beb3f3e855b2ea"
+#_commit="commit=COMMIT_SHA1"
+
 source=(
     # Git repositories; might be adjusted when a build issue arise.
     "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#$_commit"
@@ -68,8 +53,7 @@ source=(
 
     # These files might require modifications to be up-to-date. If that is the
     # case, they will be updated in place and untracked temporarily.
-    "0005-Use-system-wide-fonts.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/0005-Use-system-wide-fonts.patch?h=packages/telegram-desktop"
-    "0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch?h=packages/telegram-desktop"
+    # No patch for now...!
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -93,9 +77,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d'
-            '41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d')
+            'SKIP')
 
 prepare() {
     cd "$srcdir/tdesktop"
@@ -135,21 +117,24 @@ prepare() {
         ln -s $fixed ${fixed/_fixed/}
     done
 
-    # Here the official package uses quilt... I do it manually
-    patch -Np1 -i "$srcdir/0005-Use-system-wide-fonts.patch"
-    patch -Np1 -i "$srcdir/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch"
+    # Patch here, if needed!
+    # patch -Np1 -i "$srcdir/my_beautiful.patch"
 }
 
 build() {
     cd "$srcdir/tdesktop"
 
     export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
+
+    # Before were used:
+    # -DTDESKTOP_API_ID=17349
+    # -DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb
+
     cmake -B build -G "Unix Makefiles" . \
         -Ddisable_autoupdate=1 \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
-        -DTDESKTOP_API_ID=17349 \
-        -DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb \
+        -DTDESKTOP_API_TEST=ON \
         -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
         -DDESKTOP_APP_USE_PACKAGED=ON \
         -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
@@ -157,13 +142,14 @@ build() {
         -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
         -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
         -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-        -DDESKTOP_APP_SPECIAL_TARGET=""
+        -DDESKTOP_APP_SPECIAL_TARGET="" \
+        -DTDESKTOP_LAUNCHER_BASENAME="telegram-desktop"
     make -C build
 }
 
 package() {
     install -dm755 "$pkgdir/usr/bin"
-    install -m755 "$srcdir/tdesktop/build/bin/Telegram" "$pkgdir/usr/bin/telegram-desktop"
+    install -m755 "$srcdir/tdesktop/build/bin/telegram-desktop" "$pkgdir/usr/bin/telegram-desktop"
 
     install -d "$pkgdir/usr/share/applications"
     install -m644 "$srcdir/tdesktop/lib/xdg/telegramdesktop.desktop" "$pkgdir/usr/share/applications/telegram-desktop.desktop"