Sync && 4.6.2

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

3 files changed, 18 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88af9994bbef..0e997ab3b83f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = forkgram
 	pkgdesc = Fork of Telegram Desktop messaging app.
-	pkgver = 4.6
+	pkgver = 4.6.2
 	pkgrel = 1
 	url = https://github.com/Forkgram/tdesktop
 	arch = x86_64
@@ -14,12 +14,10 @@ pkgbase = forkgram
 	makedepends = tl-expected
 	makedepends = microsoft-gsl
 	makedepends = meson
-	makedepends = protobuf
 	makedepends = extra-cmake-modules
 	makedepends = wayland-protocols
 	makedepends = plasma-wayland-protocols
 	makedepends = libtg_owt
-	makedepends = qt6-tools
 	depends = hunspell
 	depends = ffmpeg
 	depends = hicolor-icon-theme
@@ -32,7 +30,7 @@ pkgbase = forkgram
 	depends = qt6-wayland
 	depends = qt6-5compat
 	depends = xxhash
-	depends = glibmm
+	depends = glibmm-2.68
 	depends = rnnoise
 	depends = pipewire
 	depends = libxtst
@@ -40,15 +38,13 @@ pkgbase = forkgram
 	depends = jemalloc
 	depends = abseil-cpp
 	depends = libdispatch
-	depends = glibmm-2.68
 	depends = openssl-1.1
+	depends = protobuf
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = https://github.com/Forkgram/tdesktop/releases/download/v4.6/frk-v4.6-full.tar.gz
-	source = block-sponsored_messages.patch
-	sha512sums = 0b42d50456d5db7c7ac4fdcaad5d5e6b4a66c57d2bf3303c9e48ac7d39e076ba93f37ce5d1488543802d1b023a24a0931548cb867e0d754b4b3613fad6945236
-	sha512sums = a52be36a626a79442c1f34496a1444e8012515f67a8899a34c5a97109a847a6a5d8c87f866c5c6315b87bfe411e902315a64cf93d413d7bf070b819a5f93d828
+	source = https://github.com/Forkgram/tdesktop/releases/download/v4.6.2/frk-v4.6.2-full.tar.gz
+	sha512sums = 004c9e3afd32d73bb812ae61d8f2a8f504e6be66e011d221f15c1bace191ebbb0bfffda1b4e6bb5639fa9b0f299a27fa4d3edcae5699183c966bc3e71a38811d
 
 pkgname = forkgram
diff --git a/PKGBUILD b/PKGBUILD
index e11adb3fb0fe..e9448514ef2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,27 @@
 
 pkgname=forkgram
 _pkgname=frk
-pkgver=4.6
+pkgver=4.6.2
 pkgrel=1
 pkgdesc='Fork of Telegram Desktop messaging app.'
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/Forkgram/tdesktop"
 license=('GPL3')
 depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans'
-    	 'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'qt6-5compat' 'xxhash' 'glibmm'
-		 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'abseil-cpp' 'libdispatch' 'glibmm-2.68'
-		 'openssl-1.1')
-makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'meson' 'protobuf'
-			 'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt' 'qt6-tools')
+         'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'qt6-5compat' 'xxhash' 'glibmm-2.68'
+         'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'abseil-cpp' 'libdispatch'
+         'openssl-1.1' 'protobuf')
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'meson'
+             'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt')
 optdepends=('webkit2gtk: embedded browser features'
-			'xdg-desktop-portal: desktop integration')
+            'xdg-desktop-portal: desktop integration')
 provides=(telegram-desktop)
 conflicts=(telegram-desktop)
-source=("https://github.com/Forkgram/tdesktop/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-full.tar.gz"
-        "block-sponsored_messages.patch")
-sha512sums=('0b42d50456d5db7c7ac4fdcaad5d5e6b4a66c57d2bf3303c9e48ac7d39e076ba93f37ce5d1488543802d1b023a24a0931548cb867e0d754b4b3613fad6945236'
-            'a52be36a626a79442c1f34496a1444e8012515f67a8899a34c5a97109a847a6a5d8c87f866c5c6315b87bfe411e902315a64cf93d413d7bf070b819a5f93d828')
-
-prepare() {
-    cd $_pkgname-v$pkgver-full
-    rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl
-    patch -Np1 --binary -i ../block-sponsored_messages.patch
-}
+source=("https://github.com/Forkgram/tdesktop/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-full.tar.gz")
+sha512sums=('004c9e3afd32d73bb812ae61d8f2a8f504e6be66e011d221f15c1bace191ebbb0bfffda1b4e6bb5639fa9b0f299a27fa4d3edcae5699183c966bc3e71a38811d')
 
 build() {
+    CXXFLAGS+=' -ffat-lto-objects'
     cd "${srcdir}/$_pkgname-v$pkgver-full"
     cmake \
         -B build \
@@ -38,13 +31,10 @@ build() {
         -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_BUILD_TYPE=Release \
         -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
-        -DTDESKTOP_API_TEST=ON
-    sed -i '/LINK_LIBRARIES/s/$/ \/usr\/lib\/liblzma.so/' build/build.ninja
-    ninja -C build
+        -DCMAKE_VERBOSE_MAKEFILE=ON
+	cmake --build build
 }
 
 package() {
-    cd $_pkgname-v$pkgver-full
-    DESTDIR=$pkgdir ninja -C build install
-    install -Dm644 /dev/null "$pkgdir/etc/tdesktop/externalupdater"
+  DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/block-sponsored_messages.patch b/block-sponsored_messages.patch
deleted file mode 100644
index 906132f4a420..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) {