Use git instead of tarball, since not available

Signed-off-by: Peter Jung <admin@ptr1337.dev>

4 files changed, 19 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d972d25319df..5b1676092b86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = forkgram
 	pkgdesc = Fork of Telegram Desktop messaging app.
-	pkgver = 4.15.6
+	pkgver = 4.16
 	pkgrel = 1
 	url = https://github.com/Forkgram/tdesktop
 	arch = x86_64
@@ -23,15 +23,14 @@ pkgbase = forkgram
 	makedepends = fmt
 	makedepends = mm-common
 	makedepends = perl-xml-parser
-	makedepends = libsigc++-3.0
-	makedepends = libxcomposite
+	makedepends = python-packaging
+	makedepends = dos2unix
 	depends = hunspell
 	depends = ffmpeg
 	depends = hicolor-icon-theme
 	depends = lz4
 	depends = minizip
 	depends = openal
-	depends = ttf-opensans
 	depends = qt6-imageformats
 	depends = qt6-svg
 	depends = qt6-wayland
@@ -40,24 +39,25 @@ pkgbase = forkgram
 	depends = pipewire
 	depends = libxtst
 	depends = libxrandr
-	depends = jemalloc
 	depends = abseil-cpp
 	depends = libdispatch
 	depends = openssl
 	depends = protobuf
 	depends = glib2
 	depends = libsigc++-3.0
-	depends = glibmm-2.68
-	depends = libvpx.so
+	depends = libxcomposite
+	depends = libvpx
+	depends = libxdamage
+	depends = kcoreaddons
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = forkgram-bin
 	conflicts = forkgram-bin
 	conflicts = telegram-desktop
 	options = !debug
-	source = https://github.com/Forkgram/tdesktop/releases/download/v4.15.6/frk-v4.15.6-full.tar.gz
+	source = frk-v4.16::git+https://github.com/forkgram/tdesktop.git#tag=v4.16
 	source = forkgram.desktop
-	sha512sums = d7ba3192283c812e79bc9a1845bc685a22d86c82bc4fe11cc534c2415b8020ff28cd0a752852e51440bd460620bbffeb12ceffcefc2b07e53a707c5eaf1ec069
+	sha512sums = e4d236eb8fbeaac96091fab7f7158895d57625536514741ee888b98707cc27f4eafe7be4e7716928bc2dbc192705fe480872510cc1433d244bd641d37c12b001
 	sha512sums = d6d54a5a396c0a84645ca5f38cd2d0c774d1a00f081cdf6151228b581ff1c05234550d4829aab4fe2221dec8e0477199da5a0cb1bc3a60fa1fbfe0336db365dd
 
 pkgname = forkgram
diff --git a/PKGBUILD b/PKGBUILD
index 53a04c7409d8..746e36406cc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,17 +23,15 @@ optdepends=('webkit2gtk: embedded browser features'
 provides=(forkgram-bin)
 conflicts=(forkgram-bin telegram-desktop)
 options=(!debug)
-source=("https://github.com/Forkgram/tdesktop/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-full.tar.gz"
-        "${pkgname}.desktop"
-        "block-sponsored_messages.patch"
-        "fix-lzma-link.patch")
-sha512sums=('d7ba3192283c812e79bc9a1845bc685a22d86c82bc4fe11cc534c2415b8020ff28cd0a752852e51440bd460620bbffeb12ceffcefc2b07e53a707c5eaf1ec069'
+source=(${_pkgname}-v${pkgver}::git+https://github.com/forkgram/tdesktop.git#tag=v${pkgver}
+#"https://github.com/Forkgram/tdesktop/releases/download/v${pkgver}/v${pkgver}.tar.gz"
+        "${pkgname}.desktop")
+sha512sums=('e4d236eb8fbeaac96091fab7f7158895d57625536514741ee888b98707cc27f4eafe7be4e7716928bc2dbc192705fe480872510cc1433d244bd641d37c12b001'
             'd6d54a5a396c0a84645ca5f38cd2d0c774d1a00f081cdf6151228b581ff1c05234550d4829aab4fe2221dec8e0477199da5a0cb1bc3a60fa1fbfe0336db365dd')
 
 prepare() {
-    cd ${_pkgname}-v${pkgver}-full
-    patch -Np1 --binary -i ../block-sponsored_messages.patch
-    patch -p1 --binary < ../fix-lzma-link.patch
+    cd ${_pkgname}-v${pkgver}
+    git submodule update --init --filter=tree:0 --recursive
     find "${srcdir}"/ -type f -exec dos2unix {} \;
 }
 
@@ -42,7 +40,7 @@ build() {
 
     cmake \
         -B build \
-        -S $_pkgname-$pkgver-full \
+        -S $_pkgname-v${pkgver} \
         -G Ninja \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DCMAKE_INSTALL_PREFIX="/usr" \
@@ -56,7 +54,7 @@ package() {
   DESTDIR="$pkgdir" cmake --install build
   install -Dm644 /dev/null "${pkgdir}/etc/tdesktop/externalupdater"
 
-  # Remove default icons
+  # Remove default icon
   find "${pkgdir}/usr/share/icons" -name telegram.png -delete
   rm "${pkgdir}/usr/share/applications/org.telegram.desktop.desktop" "${pkgdir}/usr/share/metainfo/org.telegram.desktop.metainfo.xml"
 
@@ -65,7 +63,7 @@ package() {
 
   # Main icons
   install -dm755 "${pkgdir}/usr/share/pixmaps/"
-  install -Dm644 "${srcdir}/${_pkgname}-v${pkgver}-full/Telegram/Resources/art/forkgram/logo_256.png" "${pkgdir}/usr/share/pixmaps/"
+  install -Dm644 "${srcdir}/${_pkgname}-v${pkgver}/Telegram/Resources/art/forkgram/logo_256.png" "${pkgdir}/usr/share/pixmaps/"
 
   # Desktop launcher
   install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
@@ -75,6 +73,6 @@ package() {
   for icon_size in 16 32 48 64 128 256 512; do
     icon_dir="${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
     install -d "${icon_dir}"
-    install -m644 "${srcdir}/${_pkgname}-v${pkgver}-full/Telegram/Resources/art/icon${icon_size}.png" "${icon_dir}/${pkgname}.png"
+    install -m644 "${srcdir}/${_pkgname}-v${pkgver}/Telegram/Resources/art/icon${icon_size}.png" "${icon_dir}/${pkgname}.png"
   done
 }
diff --git a/block-sponsored_messages.patch b/block-sponsored_messages.patch
deleted file mode 100644
index 8452a9a0cccd..000000000000
--- a/block-sponsored_messages.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp

-index c90dd3c53..f8e0a096d 100644

---- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp

-+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp

-@@ -82,7 +82,7 @@ bool SponsoredMessages::append(not_null<History*> history) {

- }

- 

- bool SponsoredMessages::canHaveFor(not_null<History*> history) const {

--	return history->peer->isChannel();

-+	return false;

- }

- 

- void SponsoredMessages::request(not_null<History*> history) {

diff --git a/fix-lzma-link.patch b/fix-lzma-link.patch
deleted file mode 100644
index 0910685cb26b..000000000000
--- a/fix-lzma-link.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-c573b65a Fix linking with LZMA when auto update is disabled

-diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt

-index 24c5909e..cb3ba61c 100644

---- a/Telegram/CMakeLists.txt

-+++ b/Telegram/CMakeLists.txt

-@@ -85,6 +85,7 @@ PRIVATE

-     desktop-app::external_qr_code_generator

-     desktop-app::external_crash_reports

-     desktop-app::external_auto_updates

-+    desktop-app::external_lzma

-     desktop-app::external_openssl

-     desktop-app::external_openal

-     desktop-app::external_xxhash

-@@ -1710,6 +1711,7 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT

-             desktop-app::external_qt

-             desktop-app::external_zlib

-             desktop-app::external_auto_updates

-+            desktop-app::external_lzma

-             desktop-app::external_openssl

-         )

- 

-diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt

-index 9be0e5a2..ed0b9aed 100644

---- a/cmake/external/CMakeLists.txt

-+++ b/cmake/external/CMakeLists.txt

-@@ -47,6 +47,7 @@ add_checked_subdirectory(jpeg)

- add_checked_subdirectory(kcoreaddons)

- add_checked_subdirectory(kimageformats)

- add_checked_subdirectory(lz4)

-+add_checked_subdirectory(lzma)

- add_checked_subdirectory(minizip)

- if (LINUX)

-     add_checked_subdirectory(nimf_qt5)

-diff --git a/cmake/external/lzma/CMakeLists.txt b/cmake/external/lzma/CMakeLists.txt

-new file mode 100644

-index 00000000..8e75394d

---- /dev/null

-+++ b/cmake/external/lzma/CMakeLists.txt

-@@ -0,0 +1,19 @@

-+# This file is inspired by Desktop App Toolkit,

-+# a set of libraries for developing nice desktop applications.

-+#

-+# For license and copyright information please follow this link:

-+# https://github.com/desktop-app/legal/blob/master/LEGAL

-+

-+if (DESKTOP_APP_USE_PACKAGED)

-+    if (DESKTOP_APP_DISABLE_AUTOUPDATE)

-+        add_library(external_lzma INTERFACE IMPORTED GLOBAL)

-+        add_library(desktop-app::external_lzma ALIAS external_lzma)

-+        find_package(PkgConfig REQUIRED)

-+        pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma)

-+        target_link_libraries(external_lzma INTERFACE PkgConfig::LZMA)

-+        return()

-+    else()

-+        # See auto_update directory contents

-+    endif()

-+    message(FATAL_ERROR "DEKSTOP_APP_USE_PACKAGED expected to be TRUE")

-+endif()