[lilac] updated to 4.2.4.r1.g0fbb2e77f-1

2 files changed, 8 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b59b68fcbb5a..8571a248945b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-git
 	pkgdesc = Official Telegram Desktop client
-	pkgver = 4.2.2.r0.g43bdfbf17
-	pkgrel = 2
+	pkgver = 4.2.4.r1.g0fbb2e77f
+	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -74,9 +74,7 @@ pkgbase = telegram-desktop-git
 	source = telegram-desktop-plasma-wayland-protocols::git+https://github.com/KDE/plasma-wayland-protocols.git
 	source = telegram-desktop-wayland-protocols::git+https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git
 	source = telegram-desktop-kimageformats::git+https://github.com/KDE/kimageformats.git
-	source = https://invent.kde.org/frameworks/kcoreaddons/-/archive/v5.98.0/kcoreaddons-v5.98.0.tar.gz
-	source = teolegram-desktop-cmake-bundled-kcoreaddons::git+https://github.com/ilya-fedin/cmake_helpers.git#branch=bundled-kcoreaddons
-	source = bundled-kcoreaddons.patch::https://github.com/ilya-fedin/cmake_helpers/compare/bundled-kcoreaddons...desktop-app:cmake_helpers:master.patch
+	source = telegram-desktop-kcoreaddons::git+https://github.com/KDE/kcoreaddons.git
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -110,8 +108,6 @@ pkgbase = telegram-desktop-git
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = d84f0d0c29f819488fd7632df28b8a9da5fb3a0724652529d3f8a59b62ea12f5f0a1755b346d2d8b015ec492dd0fead8b74199f9a7e7ada26d45b8fd7ada21c8
 	sha512sums = SKIP
-	sha512sums = cac45e8ea316e86ad3719f5e2ea1bea328d14e7c01a7b9425a05fe1a1e7b3364f6881a75d14dee28335c0c1e7290d5545a24a9c17c805686cefef3ba2d662e60
 
 pkgname = telegram-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index e184fa060dd5..c13ffcfcef4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
 # Contributor: hexchain <i@hexchain.org>
 pkgname=telegram-desktop-git
-pkgver=4.2.2.r0.g43bdfbf17
-pkgrel=2
+pkgver=4.2.4.r1.g0fbb2e77f
+pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -52,9 +52,7 @@ source=("tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#branch=de
         "telegram-desktop-plasma-wayland-protocols::git+https://github.com/KDE/plasma-wayland-protocols.git"
         "telegram-desktop-wayland-protocols::git+https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git"
         "telegram-desktop-kimageformats::git+https://github.com/KDE/kimageformats.git"
-        "https://invent.kde.org/frameworks/kcoreaddons/-/archive/v$_kcoreaddons_version/kcoreaddons-v$_kcoreaddons_version.tar.gz"
-        "teolegram-desktop-cmake-bundled-kcoreaddons::git+https://github.com/ilya-fedin/cmake_helpers.git#branch=bundled-kcoreaddons" # using bundled-kcoreaddons branch from ilya-fedin
-	"bundled-kcoreaddons.patch::https://github.com/ilya-fedin/cmake_helpers/compare/bundled-kcoreaddons...desktop-app:cmake_helpers:master.patch"
+        "telegram-desktop-kcoreaddons::git+https://github.com/KDE/kcoreaddons.git"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -89,9 +87,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'd84f0d0c29f819488fd7632df28b8a9da5fb3a0724652529d3f8a59b62ea12f5f0a1755b346d2d8b015ec492dd0fead8b74199f9a7e7ada26d45b8fd7ada21c8'
-            'SKIP'
-            'cac45e8ea316e86ad3719f5e2ea1bea328d14e7c01a7b9425a05fe1a1e7b3364f6881a75d14dee28335c0c1e7290d5545a24a9c17c805686cefef3ba2d662e60')
+            'SKIP')
 pkgver() {
     cd "$srcdir/tdesktop"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -99,7 +95,6 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/tdesktop"
-    mv "$srcdir/kcoreaddons-v$_kcoreaddons_version" "Telegram/ThirdParty/kcoreaddons"
     ## git config generated by
     # python -c 'import configparser, os.path; c=configparser.ConfigParser();c.read(".gitmodules"); print("\n".join(f"    git config submodule.{path}.url \"$srcdir/telegram-desktop-{p}\"" for s in c.sections() if (url:=c[s]["url"], path:=c[s]["path"], p:=os.path.basename(path))))'
     git submodule init
@@ -135,14 +130,8 @@ prepare() {
     git config submodule.Telegram/ThirdParty/plasma-wayland-protocols.url "$srcdir/telegram-desktop-plasma-wayland-protocols"
     git config submodule.Telegram/ThirdParty/wayland-protocols.url "$srcdir/telegram-desktop-wayland-protocols"
     git config submodule.Telegram/ThirdParty/kimageformats.url "$srcdir/telegram-desktop-kimageformats"
+    git config submodule.Telegram/ThirdParty/kcoreaddons.url "$srcdir/telegram-desktop-kcoreaddons"
     git submodule update
-
-    cd cmake
-    EMAIL=root@localhost git am "$srcdir/bundled-kcoreaddons.patch"
-    cd ..
-
-    # Upstream suggested sed headers: https://github.com/telegramdesktop/tdesktop/issues/25073#issuecomment-1253908867
-    find . -type f \( -iname '*.h' -or -iname '*.cpp' \) -print0 | xargs -0 sed -i 's/<KUrlMimeData>/<kurlmimedata.h>/g;s/<KShell>/<kshell.h>/g;s/<KSandbox>/<ksandbox.h>/g'
 }
 
 build() {