Date: Saturday, February 11, 2023 @ 02:53:48
  Author: svenstaro
Revision: 1399732

upgpkg: telegram-desktop 4.6.2-2: Go back to system Qt6 for the time being

The statically linked Qt6 had too many issuses reported and our goal here was 
to get rid
of issues and not create new ones.

Modified:
  telegram-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |   44 +++++---------------------------------------
 1 file changed, 5 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-02-11 02:19:56 UTC (rev 1399731)
+++ PKGBUILD    2023-02-11 02:53:48 UTC (rev 1399732)
@@ -2,61 +2,27 @@
 # Contributor: hexchain <[email protected]>
 pkgname=telegram-desktop
 pkgver=4.6.2
-_qtver=6.4.2
-pkgrel=1
+pkgrel=2
 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'
-         'xxhash' 'glibmm-2.68' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 
'jemalloc' 'abseil-cpp'
-         'libdispatch' 'openssl-1.1' 'protobuf'
-         'xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libxcomposite' 
'libxkbcommon-x11' 'libxrender'
-         'vulkan-headers' 'libproxy' 'double-conversion' 'pcre2')
+         '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')
 
source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz";)
-_pkgfn=qt-everywhere-src-$_qtver
-source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz";
-         
https://download.qt.io/official_releases/qt/${_qtver%.*}/$_qtver/single/$_pkgfn.tar.xz
-         
https://github.com/desktop-app/patches/archive/9aa30bc44248eb620a720459ef4c81ed0bb65065.tar.gz)
-sha512sums=('9a52cecb2ccde6e1381045b1c96730c63c5f19ca188a1be3bc905762f6e356906b7be141e8d373473390c21bc8b48ef7d5f4ee43bb09229a96b82c4fd974b531'
-            
'1b41ad1bd3f4b0780e8cd32219a5f0b037dc2c500c491a9e4a5ad7f5844356a3553856eb8aef8d73528a26f9e2bf058318ac239f55962b3368a9539f6c5d1dbe'
-            
'5c00d63bab64dda4f1ce85cbfe0a3ffba233dccf835ada3fb3e533cea9442731afdefd99505e95fdea8eed7cf63430e10c9b181c6049afc6c17dbc2dc63d73a5')
+sha512sums=('9a52cecb2ccde6e1381045b1c96730c63c5f19ca188a1be3bc905762f6e356906b7be141e8d373473390c21bc8b48ef7d5f4ee43bb09229a96b82c4fd974b531')
 
-prepare() {
-    cd $_pkgfn
-    for p in "$srcdir"/patches-*/qtbase_6_4_2/*.patch; do
-        patch -Np1 -i "$p" -d qtbase;
-    done
-}
-
 build() {
     CXXFLAGS+=' -ffat-lto-objects'
-    # Telegram needs a specific and heavily patched version of Qt6 and so we
-    # can't use system dependencies.
-    cmake -B build-qt6-base -S $_pkgfn -G Ninja \
-        -DBUILD_SHARED_LIBS=OFF \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-        -DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
-        -DCMAKE_SKIP_RPATH=ON \
-        
-DQT_BUILD_SUBMODULES="qtdeclarative;qtwayland;qtimageformats;qtsvg;qt5compat;qtshadertools"
 \
-        -DQT_FEATURE_openssl_linked=ON \
-        -DQT_FEATURE_sql=OFF \
-        -DQT_FEATURE_icu=OFF \
-        -DQT_FEATURE_libproxy=ON \
-        -DQT_FEATURE_system_xcb_xinput=ON
-    cmake --build build-qt6-base
-    DESTDIR=qt6-base cmake --install build-qt6-base
-
     # Turns out we're allowed to use the official API key that telegram uses 
for their snap builds:
     # 
https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88
     # Thanks @primeos!
-    export CMAKE_PREFIX_PATH="$srcdir"/qt6-base/usr
     cmake -B build -S tdesktop-$pkgver-full -G Ninja \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DCMAKE_INSTALL_PREFIX="/usr" \

Reply via email to