diff --git a/0001-use-bundled-ranged-exptected-gsl.patch b/0001-use-bundled-ranged-exptected-gsl.patch index 2897839..f2a27b5 100644 --- a/0001-use-bundled-ranged-exptected-gsl.patch +++ b/0001-use-bundled-ranged-exptected-gsl.patch @@ -31,13 +31,6 @@ if (DESKTOP_APP_USE_PACKAGED_LAZY) find_package(range-v3 QUIET) else() -@@ -32,4 +32,4 @@ if (NOT range-v3_FOUND) - /wd5105 # needed for `/Zc:preprocessor`, suppressing C5105 "macro expansion producing 'defined' has undefined behavior" - ) - endif() --endif() -\ No newline at end of file -+endif() --- a/cmake/external/webrtc/CMakeLists.txt +++ b/cmake/external/webrtc/CMakeLists.txt @@ -7,7 +7,7 @@ @@ -48,15 +41,4 @@ +if (NOT DESKTOP_APP_USE_PACKAGED) find_package(tg_owt REQUIRED) target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) - else() ---- a/cmake/external/rlottie/CMakeLists.txt -+++ b/cmake/external/rlottie/CMakeLists.txt -@@ -7,7 +7,7 @@ - add_library(external_rlottie INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_rlottie ALIAS external_rlottie) - --if (DESKTOP_APP_USE_PACKAGED) -+if (NOT DESKTOP_APP_USE_PACKAGED) - find_package(rlottie QUIET) - - if (rlottie_FOUND) + return() diff --git a/0003-add-qt5-widgets-include.patch b/0003-add-qt5-widgets-include.patch new file mode 100644 index 0000000..f4fe2b6 --- /dev/null +++ b/0003-add-qt5-widgets-include.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/external/qt/CMakeLists.txt b/cmake/external/qt/CMakeLists.txt +index a4b15d3..fbd9630 100644 +--- a/cmake/external/qt/CMakeLists.txt ++++ b/cmake/external/qt/CMakeLists.txt +@@ -27,6 +27,7 @@ if (DESKTOP_APP_USE_PACKAGED) + INTERFACE + ${Qt5Core_PRIVATE_INCLUDE_DIRS} + ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ++ ${Qt5Widgets_PRIVATE_INCLUDE_DIRS} + ) + + if (Qt5DBus_FOUND) +@@ -65,6 +66,7 @@ INTERFACE + ${qt_loc}/include/QtGui/${qt_version} + ${qt_loc}/include/QtCore/${qt_version}/QtCore + ${qt_loc}/include/QtGui/${qt_version}/QtGui ++ ${qt_loc}/include/QtWidgets/${qt_version}/QtWidgets + ) + + if (Qt5DBus_FOUND) diff --git a/0004-use-dynamic-x-libraries.patch b/0004-use-dynamic-x-libraries.patch index 1e7e590..dc8b81f 100644 --- a/0004-use-dynamic-x-libraries.patch +++ b/0004-use-dynamic-x-libraries.patch @@ -1,11 +1,11 @@ --- a/cmake/external/webrtc/CMakeLists.txt +++ b/cmake/external/webrtc/CMakeLists.txt @@ -105,7 +105,7 @@ - ) - else() - # Required for desktop_capture -- target_link_static_libraries(external_webrtc -+ target_link_libraries(external_webrtc - INTERFACE - Xcomposite - Xdamage + ) + else() + # Required for desktop_capture +- target_link_static_libraries(external_webrtc ++ target_link_libraries(external_webrtc + INTERFACE + Xcomposite + Xdamage diff --git a/tdesktop-3.4.3-full.tar.gz b/tdesktop-3.4.3-full.tar.gz deleted file mode 100644 index 26c7fd3..0000000 --- a/tdesktop-3.4.3-full.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad673a434a3ca335789c55f6f555a2482f734d897b6f0798dcd837ce65b79405 -size 40647558 diff --git a/tdesktop-3.5.0-full.tar.gz b/tdesktop-3.5.0-full.tar.gz new file mode 100644 index 0000000..a126a65 --- /dev/null +++ b/tdesktop-3.5.0-full.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b5742d05a97bd9a9602419293cfeb5023b98fba81fb465db0d881ce811f6706 +size 41200724 diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 0d3d661..1e908c2 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Fri Feb 4 02:57:59 UTC 2022 - Xu Zhao + +- Add 0003-add-qt5-widgets-include.patch + * Fix Qt5Widgets private header include issue. + +------------------------------------------------------------------- +Thu Feb 3 03:40:16 UTC 2022 - Xu Zhao + +- Update to 3.5.0 + * Use a new type of detailed stickers with smooth animations. + * Create new sets by sending .webm videos to @stickers. + * Bring your custom animated stickers from other apps. + * See smaller, compact animations when reacting to messages. + * See real-time animations in chat when a user reacts to your message. + * React with additional emoji expressing love, appreciation, + anger or surprise. + * Tap the new button in chats to jump to your messages that have + unseen reactions. + * Watch the animations for unseen reactions play when you + hit the button. + * The app will warn you before closing if you are uploading + photos or files to a chat. + * Enjoy better screencast quality in video chats. +- Update tg_owt +- Rebase patches +------------------------------------------------------------------- Tue Jan 4 15:45:39 UTC 2022 - Marcel Kuehlhorn - Update to 3.4.3 diff --git a/telegram-desktop.spec b/telegram-desktop.spec index ad53113..d240b1d 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -21,20 +21,13 @@ %define _lto_cflags %{nil} %endif -# We need current gcc to build -%if 0%{?suse_version} < 01550 && 0%{?is_opensuse} -%bcond_without fixed_gcc -%else -%bcond_with fixed_gcc -%endif - %define __builder ninja %define _dwz_low_mem_die_limit 40000000 %define _dwz_max_die_limit 200000000 Name: telegram-desktop -Version: 3.4.3 +Version: 3.5.0 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only @@ -50,6 +43,8 @@ Patch1: 0001-use-bundled-ranged-exptected-gsl.patch # PATCH-FIX-OPENSUSE Patch2: 0002-tg_owt-fix-name-confliction.patch # PATCH-FIX-OPENSUSE +Patch3: 0003-add-qt5-widgets-include.patch +# PATCH-FIX-OPENSUSE Patch4: 0004-use-dynamic-x-libraries.patch # PATCH-FIX-OPENSUSE Patch5: 0005-add-wayland-include-path.patch @@ -60,16 +55,12 @@ Patch5: 0005-add-wayland-include-path.patch ExcludeArch: %ix86 aarch64_ilp32 ppc riscv32 BuildRequires: appstream-glib BuildRequires: chrpath +BuildRequires: clang BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils BuildRequires: enchant-devel BuildRequires: ffmpeg-devel BuildRequires: freetype-devel -%if %{with fixed_gcc} -BuildRequires: gcc10-c++ -%else -BuildRequires: gcc-c++ -%endif BuildRequires: glibc-devel BuildRequires: libQt5Core-private-headers-devel >= 5.15 BuildRequires: libQt5Gui-private-headers-devel >= 5.15 @@ -99,6 +90,7 @@ BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glibmm-2.4) BuildRequires: pkgconfig(gtk+-2.0) @@ -138,6 +130,7 @@ BuildRequires: pkgconfig(portaudiocpp) BuildRequires: pkgconfig(rnnoise) BuildRequires: pkgconfig(tslib) BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-icccm) @@ -169,6 +162,7 @@ The service also provides APIs to independent developers. %prep %setup -q -n tdesktop-%{version}-full %patch1 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -179,10 +173,6 @@ mv tg_owt-master Libraries/tg_owt %patch2 -p2 -d Libraries/tg_owt %build -%if %{with fixed_gcc} -export CC="/usr/bin/gcc-10" -export CXX="/usr/bin/g++-10" -%endif # Fix build failures due to not finding installed headers for xkbcommon and wayland-client export CXXFLAGS+="`pkg-config --cflags xkbcommon wayland-client`" @@ -197,6 +187,7 @@ cmake -G Ninja \ -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/include/openssl \ -DTG_OWT_OPUS_INCLUDE_PATH=/usr/include/opus \ -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/include/ffmpeg \ + -DTG_OWT_LIBVPX_INCLUDE_PATH=/usr/include/vpx \ ../.. sed -i 's,gnu++2a,gnu++17,g' build.ninja ninja diff --git a/tg_owt-master.zip b/tg_owt-master.zip index b22add7..2956fef 100644 --- a/tg_owt-master.zip +++ b/tg_owt-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:057c124a2e8ad4884da765f40ed4e2a7bcacfa061ed7863cf16b01a264105a92 -size 32000105 +oid sha256:ebbddd0b599d3b72e7b958f62b886a7a0ffdc64b644d7e3812c27df9eddafed8 +size 32225063