[lilac] updated to 2.5.4.r1.gadc8d6a6d-1

2 files changed, 106 insertions, 106 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0f5c2e097d1..64e9daee5137 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = telegram-desktop-git
-	pkgdesc = Official Telegram Desktop client (dev branch)
-	pkgver = 2.4.14.r25.ga0b079939
+	pkgdesc = Official Telegram Desktop client
+	pkgver = 2.5.4.r1.gadc8d6a6d
 	pkgrel = 1
 	url = https://desktop.telegram.org/
-	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
@@ -13,7 +12,7 @@ pkgbase = telegram-desktop-git
 	makedepends = range-v3
 	makedepends = tl-expected
 	makedepends = microsoft-gsl
-	makedepends = libtg_owt
+	makedepends = libtg_owt-git
 	depends = hunspell
 	depends = ffmpeg
 	depends = hicolor-icon-theme
@@ -23,43 +22,43 @@ pkgbase = telegram-desktop-git
 	depends = qt5-imageformats
 	depends = xxhash
 	depends = libdbusmenu-qt5
-	depends = qt5-wayland
+	depends = kwayland
 	depends = gtk3
 	optdepends = ttf-opensans: default Open Sans font family
 	provides = telegram-desktop
 	conflicts = telegram-desktop
 	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev
-	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
-	source = GSL::git+https://github.com/Microsoft/GSL.git
-	source = Catch::git+https://github.com/philsquared/Catch
-	source = xxHash::git+https://github.com/Cyan4973/xxHash.git
-	source = rlottie::git+https://github.com/desktop-app/rlottie.git
-	source = lz4::git+https://github.com/lz4/lz4.git
-	source = lib_crl::git+https://github.com/desktop-app/lib_crl.git
-	source = lib_rpl::git+https://github.com/desktop-app/lib_rpl.git
-	source = lib_base::git+https://github.com/desktop-app/lib_base.git
-	source = codegen::git+https://github.com/desktop-app/codegen.git
-	source = lib_ui::git+https://github.com/desktop-app/lib_ui.git
-	source = lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git
-	source = lib_lottie::git+https://github.com/desktop-app/lib_lottie.git
-	source = lib_tl::git+https://github.com/desktop-app/lib_tl.git
-	source = lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck
-	source = lib_storage::git+https://github.com/desktop-app/lib_storage.git
-	source = cmake_helpers::git+https://github.com/desktop-app/cmake_helpers.git
-	source = expected::git+https://github.com/TartanLlama/expected
-	source = QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator
-	source = lib_qr::git+https://github.com/desktop-app/lib_qr.git
-	source = libdbusmenu-qt::git+https://github.com/desktop-app/libdbusmenu-qt.git
-	source = hunspell::git+https://github.com/hunspell/hunspell
-	source = materialdecoration::git+https://github.com/desktop-app/materialdecoration.git
-	source = range-v3::git+https://github.com/ericniebler/range-v3.git
-	source = fcitx-qt5::git+https://github.com/fcitx/fcitx-qt5.git
-	source = nimf::git+https://github.com/hamonikr/nimf.git
-	source = hime::git+https://github.com/hime-ime/hime.git
-	source = qt5ct::git+https://github.com/desktop-app/qt5ct.git
-	source = fcitx5-qt::git+https://github.com/fcitx/fcitx5-qt.git
-	source = lib_webrtc::git+https://github.com/desktop-app/lib_webrtc.git
-	source = tgcalls::git+https://github.com/TelegramMessenger/tgcalls.git
+	source = telegram-desktop-libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
+	source = telegram-desktop-GSL::git+https://github.com/Microsoft/GSL.git
+	source = telegram-desktop-Catch::git+https://github.com/philsquared/Catch
+	source = telegram-desktop-xxHash::git+https://github.com/Cyan4973/xxHash.git
+	source = telegram-desktop-rlottie::git+https://github.com/desktop-app/rlottie.git
+	source = telegram-desktop-lz4::git+https://github.com/lz4/lz4.git
+	source = telegram-desktop-lib_crl::git+https://github.com/desktop-app/lib_crl.git
+	source = telegram-desktop-lib_rpl::git+https://github.com/desktop-app/lib_rpl.git
+	source = telegram-desktop-lib_base::git+https://github.com/desktop-app/lib_base.git
+	source = telegram-desktop-codegen::git+https://github.com/desktop-app/codegen.git
+	source = telegram-desktop-lib_ui::git+https://github.com/desktop-app/lib_ui.git
+	source = telegram-desktop-lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git
+	source = telegram-desktop-lib_lottie::git+https://github.com/desktop-app/lib_lottie.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-expected::git+https://github.com/TartanLlama/expected
+	source = telegram-desktop-QR-Code-generator::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
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -94,3 +93,4 @@ pkgbase = telegram-desktop-git
 	sha512sums = SKIP
 
 pkgname = telegram-desktop-git
+
diff --git a/PKGBUILD b/PKGBUILD
index a3c930c8fbad..6c893b148377 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,50 @@
-# Maintainer: Jiachen YANG <farseerfc@gmail.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
 # Contributor: hexchain <i@hexchain.org>
 pkgname=telegram-desktop-git
-pkgver=2.4.14.r25.ga0b079939
+pkgver=2.5.4.r1.gadc8d6a6d
 pkgrel=1
-pkgdesc='Official Telegram Desktop client (dev branch)'
-arch=('i686' 'x86_64')
+pkgdesc='Official Telegram Desktop client'
+arch=('x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
 depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
-         'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'qt5-wayland' 'gtk3')
-makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libtg_owt')
+         'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3')
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libtg_owt-git')
 optdepends=('ttf-opensans: default Open Sans font family')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+provides=("telegram-desktop")
+conflicts=("telegram-desktop")
 source=("tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev"
-        "libtgvoip::git+https://github.com/telegramdesktop/libtgvoip"
-        "GSL::git+https://github.com/Microsoft/GSL.git"
-        "Catch::git+https://github.com/philsquared/Catch"
-        "xxHash::git+https://github.com/Cyan4973/xxHash.git"
-        "rlottie::git+https://github.com/desktop-app/rlottie.git"
-        "lz4::git+https://github.com/lz4/lz4.git"
-        "lib_crl::git+https://github.com/desktop-app/lib_crl.git"
-        "lib_rpl::git+https://github.com/desktop-app/lib_rpl.git"
-        "lib_base::git+https://github.com/desktop-app/lib_base.git"
-        "codegen::git+https://github.com/desktop-app/codegen.git"
-        "lib_ui::git+https://github.com/desktop-app/lib_ui.git"
-        "lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git"
-        "lib_lottie::git+https://github.com/desktop-app/lib_lottie.git"
-        "lib_tl::git+https://github.com/desktop-app/lib_tl.git"
-        "lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck"
-        "lib_storage::git+https://github.com/desktop-app/lib_storage.git"
-        "cmake_helpers::git+https://github.com/desktop-app/cmake_helpers.git"
-        "expected::git+https://github.com/TartanLlama/expected"
-        "QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator"
-        "lib_qr::git+https://github.com/desktop-app/lib_qr.git"
-        "libdbusmenu-qt::git+https://github.com/desktop-app/libdbusmenu-qt.git"
-        "hunspell::git+https://github.com/hunspell/hunspell"
-        "materialdecoration::git+https://github.com/desktop-app/materialdecoration.git"
-        "range-v3::git+https://github.com/ericniebler/range-v3.git"
-        "fcitx-qt5::git+https://github.com/fcitx/fcitx-qt5.git"
-        "nimf::git+https://github.com/hamonikr/nimf.git"
-        "hime::git+https://github.com/hime-ime/hime.git"
-        "qt5ct::git+https://github.com/desktop-app/qt5ct.git"
-        "fcitx5-qt::git+https://github.com/fcitx/fcitx5-qt.git"
-        "lib_webrtc::git+https://github.com/desktop-app/lib_webrtc.git"
-        "tgcalls::git+https://github.com/TelegramMessenger/tgcalls.git"
+        "telegram-desktop-libtgvoip::git+https://github.com/telegramdesktop/libtgvoip"
+        "telegram-desktop-GSL::git+https://github.com/Microsoft/GSL.git"
+        "telegram-desktop-Catch::git+https://github.com/philsquared/Catch"
+        "telegram-desktop-xxHash::git+https://github.com/Cyan4973/xxHash.git"
+        "telegram-desktop-rlottie::git+https://github.com/desktop-app/rlottie.git"
+        "telegram-desktop-lz4::git+https://github.com/lz4/lz4.git"
+        "telegram-desktop-lib_crl::git+https://github.com/desktop-app/lib_crl.git"
+        "telegram-desktop-lib_rpl::git+https://github.com/desktop-app/lib_rpl.git"
+        "telegram-desktop-lib_base::git+https://github.com/desktop-app/lib_base.git"
+        "telegram-desktop-codegen::git+https://github.com/desktop-app/codegen.git"
+        "telegram-desktop-lib_ui::git+https://github.com/desktop-app/lib_ui.git"
+        "telegram-desktop-lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git"
+        "telegram-desktop-lib_lottie::git+https://github.com/desktop-app/lib_lottie.git"
+        "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-expected::git+https://github.com/TartanLlama/expected"
+        "telegram-desktop-QR-Code-generator::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"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -86,37 +86,37 @@ pkgver() {
 prepare() {
     cd "$srcdir/tdesktop"
     git submodule init
-    git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/libtgvoip"
-    git config submodule.Telegram/ThirdParty/GSL.url "$srcdir/GSL"
-    git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch"
-    git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/xxHash"
-    git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/rlottie"
-    git config submodule.Telegram/ThirdParty/lz4.url "$srcdir/lz4"
-    git config submodule.Telegram/lib_crl.url "$srcdir/lib_crl"
-    git config submodule.Telegram/lib_rpl.url "$srcdir/lib_rpl"
-    git config submodule.Telegram/lib_base.url "$srcdir/lib_base"
-    git config submodule.Telegram/codegen.url "$srcdir/codegen"
-    git config submodule.Telegram/lib_ui.url "$srcdir/lib_ui"
-    git config submodule.Telegram/lib_rlottie.url "$srcdir/lib_rlottie"
-    git config submodule.Telegram/lib_lottie.url "$srcdir/lib_lottie"
-    git config submodule.Telegram/lib_tl.url "$srcdir/lib_tl"
-    git config submodule.Telegram/lib_spellcheck.url "$srcdir/lib_spellcheck"
-    git config submodule.Telegram/lib_storage.url "$srcdir/lib_storage"
-    git config submodule.cmake.url "$srcdir/cmake_helpers"
-    git config submodule.Telegram/ThirdParty/expected.url "$srcdir/expected"
-    git config submodule.Telegram/ThirdParty/QR.url "$srcdir/QR-Code-generator"
-    git config submodule.Telegram/lib_qr.url "$srcdir/lib_qr"
-    git config submodule.Telegram/ThirdParty/libdbusmenu-qt.url "$srcdir/libdbusmenu-qt"
-    git config sumbodule.Telegram/ThirdParty/hunspell.url "$srcdir/hunspell"
-    git config sumbodule.Telegram/ThirdParty/materialdecoration.url "$srcdir/materialdecoration"
-    git config sumbodule.Telegram/ThirdParty/range-v3.url "$srcdir/range-v3"
-    git config sumbodule.Telegram/ThirdParty/fcitx-qt5.url "$srcdir/fcitx-qt5"
-    git config sumbodule.Telegram/ThirdParty/nimf.url "$srcdir/nimf"
-    git config sumbodule.Telegram/ThirdParty/hime.url "$srcdir/hime"
-    git config sumbodule.Telegram/ThirdParty/qt5ct.url "$srcdir/qt5ct"
-    git config sumbodule.Telegram/ThirdParty/fcitx5-qt.url "$srcdir/fcitx5-qt"
-    git config sumbodule.Telegram/lib_webrtc.url "$srcdir/lib_webrtc"
-    git config sumbodule.Telegram/ThirdParty/tgcalls.url "$srcdir/tgcalls"
+    git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/telegram-desktop-libtgvoip"
+    git config submodule.Telegram/ThirdParty/GSL.url "$srcdir/telegram-desktop-GSL"
+    git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/telegram-desktop-Catch"
+    git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/telegram-desktop-xxHash"
+    git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/telegram-desktop-rlottie"
+    git config submodule.Telegram/ThirdParty/lz4.url "$srcdir/telegram-desktop-lz4"
+    git config submodule.Telegram/lib_crl.url "$srcdir/telegram-desktop-lib_crl"
+    git config submodule.Telegram/lib_rpl.url "$srcdir/telegram-desktop-lib_rpl"
+    git config submodule.Telegram/lib_base.url "$srcdir/telegram-desktop-lib_base"
+    git config submodule.Telegram/codegen.url "$srcdir/telegram-desktop-codegen"
+    git config submodule.Telegram/lib_ui.url "$srcdir/telegram-desktop-lib_ui"
+    git config submodule.Telegram/lib_rlottie.url "$srcdir/telegram-desktop-lib_rlottie"
+    git config submodule.Telegram/lib_lottie.url "$srcdir/telegram-desktop-lib_lottie"
+    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.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/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 submodule update
 
     cd cmake