[lilac] updated to 3.1.9.r31.g7222bc63f-1

2 files changed, 47 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2670732b9ebe..1401b1aab1ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-git
 	pkgdesc = Official Telegram Desktop client
-	pkgver = 2.8.11.r0.g77d8c7ce0
-	pkgrel = 2
+	pkgver = 3.1.9.r31.g7222bc63f
+	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -13,8 +13,8 @@ pkgbase = telegram-desktop-git
 	makedepends = tl-expected
 	makedepends = microsoft-gsl
 	makedepends = extra-cmake-modules
-	makedepends = jemalloc
-	makedepends = libtg_owt-git
+	makedepends = gtk3
+	makedepends = webkit2gtk
 	depends = hunspell
 	depends = ffmpeg
 	depends = hicolor-icon-theme
@@ -23,17 +23,20 @@ pkgbase = telegram-desktop-git
 	depends = openal
 	depends = ttf-opensans
 	depends = qt5-imageformats
+	depends = qt5-svg
 	depends = xxhash
 	depends = libdbusmenu-qt5
 	depends = kwayland
-	depends = gtk3
 	depends = glibmm
-	depends = webkit2gtk
 	depends = rnnoise
 	depends = pipewire
 	depends = libxtst
 	depends = libxrandr
-	optdepends = ttf-opensans: default Open Sans font family
+	depends = jemalloc
+	depends = libtg_owt-git
+	optdepends = gtk3: GTK environment integration
+	optdepends = webkit2gtk: embedded browser features
+	optdepends = xdg-desktop-portal: desktop integration
 	provides = telegram-desktop
 	conflicts = telegram-desktop
 	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev
@@ -53,22 +56,23 @@ pkgbase = telegram-desktop-git
 	source = telegram-desktop-lib_tl::git+https://github.com/desktop-app/lib_tl.git
 	source = telegram-desktop-lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck
 	source = telegram-desktop-lib_storage::git+https://github.com/desktop-app/lib_storage.git
-	source = telegram-desktop-cmake_helpers::git+https://github.com/desktop-app/cmake_helpers.git
+	source = telegram-desktop-cmake::git+https://github.com/desktop-app/cmake_helpers.git
 	source = telegram-desktop-expected::git+https://github.com/TartanLlama/expected
-	source = telegram-desktop-QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator
+	source = telegram-desktop-QR::git+https://github.com/nayuki/QR-Code-generator
 	source = telegram-desktop-lib_qr::git+https://github.com/desktop-app/lib_qr.git
 	source = telegram-desktop-libdbusmenu-qt::git+https://github.com/desktop-app/libdbusmenu-qt.git
 	source = telegram-desktop-hunspell::git+https://github.com/hunspell/hunspell
-	source = telegram-desktop-materialdecoration::git+https://github.com/desktop-app/materialdecoration.git
 	source = telegram-desktop-range-v3::git+https://github.com/ericniebler/range-v3.git
 	source = telegram-desktop-fcitx-qt5::git+https://github.com/fcitx/fcitx-qt5.git
 	source = telegram-desktop-nimf::git+https://github.com/hamonikr/nimf.git
 	source = telegram-desktop-hime::git+https://github.com/hime-ime/hime.git
-	source = telegram-desktop-qt5ct::git+https://github.com/desktop-app/qt5ct.git
 	source = telegram-desktop-fcitx5-qt::git+https://github.com/fcitx/fcitx5-qt.git
 	source = telegram-desktop-lib_webrtc::git+https://github.com/desktop-app/lib_webrtc.git
 	source = telegram-desktop-tgcalls::git+https://github.com/TelegramMessenger/tgcalls.git
-	source = fix-webview-extern-C-linkage.patch::https://patch-diff.githubusercontent.com/raw/desktop-app/lib_webview/pull/9.patch
+	source = telegram-desktop-lib_webview::git+https://github.com/desktop-app/lib_webview.git
+	source = telegram-desktop-lib_waylandshells::git+https://github.com/desktop-app/lib_waylandshells.git
+	source = telegram-desktop-jemalloc::git+https://github.com/jemalloc/jemalloc
+	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -101,6 +105,5 @@ pkgbase = telegram-desktop-git
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 6f405d48457f8839c9759ec1024db20251f0d42a3ec0026d1334d56511877f830213ac4b3c2396319dc8811e330324a4d62a0973221e280063aa69c18fd09a0e
 
 pkgname = telegram-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 62ef58cf5225..d29b504ebc55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,24 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
 # Contributor: hexchain <i@hexchain.org>
 pkgname=telegram-desktop-git
-pkgver=2.8.11.r0.g77d8c7ce0
-pkgrel=2
+pkgver=3.1.9.r31.g7222bc63f
+pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
 depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans'
-         'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3' 'glibmm'
-         'webkit2gtk' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' )
+         'qt5-imageformats' 'qt5-svg' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'glibmm'
+         'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'libtg_owt-git')
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl'
-             'extra-cmake-modules' 'jemalloc'
-             'libtg_owt-git')
-optdepends=('ttf-opensans: default Open Sans font family')
+             'extra-cmake-modules' 'gtk3' 'webkit2gtk')
+optdepends=('gtk3: GTK environment integration'
+            'webkit2gtk: embedded browser features'
+            'xdg-desktop-portal: desktop integration')
 provides=("telegram-desktop")
 conflicts=("telegram-desktop")
+## source array generated from:
+# python -c 'import configparser, os.path; c=configparser.ConfigParser();c.read(".gitmodules"); print("\n".join(f"\t\"telegram-desktop-{path}::git+{u}\"" for s in c.sections() if (url:=c[s]["url"], path:=os.path.basename(c[s]["path"]), u:= url if url.endswith(".git") else url+".git")))'
 source=("tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev"
         "telegram-desktop-libtgvoip::git+https://github.com/telegramdesktop/libtgvoip"
         "telegram-desktop-GSL::git+https://github.com/Microsoft/GSL.git"
@@ -33,22 +36,22 @@ source=("tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev"
         "telegram-desktop-lib_tl::git+https://github.com/desktop-app/lib_tl.git"
         "telegram-desktop-lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck"
         "telegram-desktop-lib_storage::git+https://github.com/desktop-app/lib_storage.git"
-        "telegram-desktop-cmake_helpers::git+https://github.com/desktop-app/cmake_helpers.git"
+        "telegram-desktop-cmake::git+https://github.com/desktop-app/cmake_helpers.git"
         "telegram-desktop-expected::git+https://github.com/TartanLlama/expected"
-        "telegram-desktop-QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator"
+        "telegram-desktop-QR::git+https://github.com/nayuki/QR-Code-generator"
         "telegram-desktop-lib_qr::git+https://github.com/desktop-app/lib_qr.git"
         "telegram-desktop-libdbusmenu-qt::git+https://github.com/desktop-app/libdbusmenu-qt.git"
         "telegram-desktop-hunspell::git+https://github.com/hunspell/hunspell"
-        "telegram-desktop-materialdecoration::git+https://github.com/desktop-app/materialdecoration.git"
         "telegram-desktop-range-v3::git+https://github.com/ericniebler/range-v3.git"
         "telegram-desktop-fcitx-qt5::git+https://github.com/fcitx/fcitx-qt5.git"
         "telegram-desktop-nimf::git+https://github.com/hamonikr/nimf.git"
         "telegram-desktop-hime::git+https://github.com/hime-ime/hime.git"
-        "telegram-desktop-qt5ct::git+https://github.com/desktop-app/qt5ct.git"
         "telegram-desktop-fcitx5-qt::git+https://github.com/fcitx/fcitx5-qt.git"
         "telegram-desktop-lib_webrtc::git+https://github.com/desktop-app/lib_webrtc.git"
         "telegram-desktop-tgcalls::git+https://github.com/TelegramMessenger/tgcalls.git"
-	"fix-webview-extern-C-linkage.patch::https://patch-diff.githubusercontent.com/raw/desktop-app/lib_webview/pull/9.patch"
+        "telegram-desktop-lib_webview::git+https://github.com/desktop-app/lib_webview.git"
+        "telegram-desktop-lib_waylandshells::git+https://github.com/desktop-app/lib_waylandshells.git"
+        "telegram-desktop-jemalloc::git+https://github.com/jemalloc/jemalloc"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -82,7 +85,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '6f405d48457f8839c9759ec1024db20251f0d42a3ec0026d1334d56511877f830213ac4b3c2396319dc8811e330324a4d62a0973221e280063aa69c18fd09a0e')
+            'SKIP')
 pkgver() {
     cd "$srcdir/tdesktop"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -90,6 +93,8 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/tdesktop"
+    ## 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
     git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/telegram-desktop-libtgvoip"
     git config submodule.Telegram/ThirdParty/GSL.url "$srcdir/telegram-desktop-GSL"
@@ -107,36 +112,23 @@ prepare() {
     git config submodule.Telegram/lib_tl.url "$srcdir/telegram-desktop-lib_tl"
     git config submodule.Telegram/lib_spellcheck.url "$srcdir/telegram-desktop-lib_spellcheck"
     git config submodule.Telegram/lib_storage.url "$srcdir/telegram-desktop-lib_storage"
-    git config submodule.cmake.url "$srcdir/telegram-desktop-cmake_helpers"
+    git config submodule.cmake.url "$srcdir/telegram-desktop-cmake"
     git config submodule.Telegram/ThirdParty/expected.url "$srcdir/telegram-desktop-expected"
-    git config submodule.Telegram/ThirdParty/QR.url "$srcdir/telegram-desktop-QR-Code-generator"
+    git config submodule.Telegram/ThirdParty/QR.url "$srcdir/telegram-desktop-QR"
     git config submodule.Telegram/lib_qr.url "$srcdir/telegram-desktop-lib_qr"
     git config submodule.Telegram/ThirdParty/libdbusmenu-qt.url "$srcdir/telegram-desktop-libdbusmenu-qt"
-    git config sumbodule.Telegram/ThirdParty/hunspell.url "$srcdir/telegram-desktop-hunspell"
-    git config sumbodule.Telegram/ThirdParty/materialdecoration.url "$srcdir/telegram-desktop-materialdecoration"
-    git config sumbodule.Telegram/ThirdParty/range-v3.url "$srcdir/telegram-desktop-range-v3"
-    git config sumbodule.Telegram/ThirdParty/fcitx-qt5.url "$srcdir/telegram-desktop-fcitx-qt5"
-    git config sumbodule.Telegram/ThirdParty/nimf.url "$srcdir/telegram-desktop-nimf"
-    git config sumbodule.Telegram/ThirdParty/hime.url "$srcdir/telegram-desktop-hime"
-    git config sumbodule.Telegram/ThirdParty/qt5ct.url "$srcdir/telegram-desktop-qt5ct"
-    git config sumbodule.Telegram/ThirdParty/fcitx5-qt.url "$srcdir/telegram-desktop-fcitx5-qt"
-    git config sumbodule.Telegram/lib_webrtc.url "$srcdir/telegram-desktop-lib_webrtc"
-    git config sumbodule.Telegram/ThirdParty/tgcalls.url "$srcdir/telegram-desktop-tgcalls"
+    git config submodule.Telegram/ThirdParty/hunspell.url "$srcdir/telegram-desktop-hunspell"
+    git config submodule.Telegram/ThirdParty/range-v3.url "$srcdir/telegram-desktop-range-v3"
+    git config submodule.Telegram/ThirdParty/fcitx-qt5.url "$srcdir/telegram-desktop-fcitx-qt5"
+    git config submodule.Telegram/ThirdParty/nimf.url "$srcdir/telegram-desktop-nimf"
+    git config submodule.Telegram/ThirdParty/hime.url "$srcdir/telegram-desktop-hime"
+    git config submodule.Telegram/ThirdParty/fcitx5-qt.url "$srcdir/telegram-desktop-fcitx5-qt"
+    git config submodule.Telegram/lib_webrtc.url "$srcdir/telegram-desktop-lib_webrtc"
+    git config submodule.Telegram/ThirdParty/tgcalls.url "$srcdir/telegram-desktop-tgcalls"
+    git config submodule.Telegram/lib_webview.url "$srcdir/telegram-desktop-lib_webview"
+    git config submodule.Telegram/lib_waylandshells.url "$srcdir/telegram-desktop-lib_waylandshells"
+    git config submodule.Telegram/ThirdParty/jemalloc.url "$srcdir/telegram-desktop-jemalloc"
     git submodule update
-
-    cd cmake
-    # force webrtc link to libjpeg and X11 libs
-    echo "target_link_libraries(external_webrtc INTERFACE jpeg)" | tee -a external/webrtc/CMakeLists.txt
-    echo "find_package(X11 REQUIRED COMPONENTS Xcomposite Xdamage Xext Xfixes Xrender Xrandr Xtst)" | tee -a external/webrtc/CMakeLists.txt
-    echo "target_link_libraries(external_webrtc INTERFACE Xcomposite Xdamage Xext Xfixes Xrandr Xrender Xtst)" | tee -a external/webrtc/CMakeLists.txt
-
-    cd ..
-    # fix extern "C" linkage with lib_webview
-    patch -b -d Telegram/lib_webview/ -Np1 -i ${srcdir}/fix-webview-extern-C-linkage.patch
- 
-    # cp libjemalloc from jemalloc package
-    mkdir -p external/jemalloc/jemalloc-prefix/src/jemalloc/lib/
-    cp /usr/lib/libjemalloc_pic.a external/jemalloc/jemalloc-prefix/src/jemalloc/lib/libjemalloc.a
 }
 
 build() {