diff --git a/0001-use-bundled-ranged-exptected-gsl.patch b/0001-use-bundled-ranged-exptected-gsl.patch index 9780c4d..2897839 100644 --- a/0001-use-bundled-ranged-exptected-gsl.patch +++ b/0001-use-bundled-ranged-exptected-gsl.patch @@ -1,7 +1,5 @@ -diff --git a/tdesktop-2.3.2-full/cmake/external/expected/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/expected/CMakeLists.txt -index 10c2c26..fddfbb4 100644 ---- a/tdesktop-2.3.2-full/cmake/external/expected/CMakeLists.txt -+++ b/tdesktop-2.3.2-full-patched/cmake/external/expected/CMakeLists.txt +--- a/cmake/external/expected/CMakeLists.txt ++++ b/cmake/external/expected/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(external_expected INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_expected ALIAS external_expected) @@ -11,10 +9,8 @@ index 10c2c26..fddfbb4 100644 if (DESKTOP_APP_USE_PACKAGED_LAZY) find_package(tl-expected QUIET) else() -diff --git a/tdesktop-2.3.2-full/cmake/external/gsl/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/gsl/CMakeLists.txt -index b03be4f..80c0e07 100644 ---- a/tdesktop-2.3.2-full/cmake/external/gsl/CMakeLists.txt -+++ b/tdesktop-2.3.2-full-patched/cmake/external/gsl/CMakeLists.txt +--- a/cmake/external/gsl/CMakeLists.txt ++++ b/cmake/external/gsl/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(external_gsl INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_gsl ALIAS external_gsl) @@ -24,10 +20,8 @@ index b03be4f..80c0e07 100644 if (DESKTOP_APP_USE_PACKAGED_LAZY) find_package(Microsoft.GSL QUIET) else() -diff --git a/tdesktop-2.3.2-full/cmake/external/ranges/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/ranges/CMakeLists.txt -index 5a584dd..9b9049f 100644 ---- a/tdesktop-2.3.2-full/cmake/external/ranges/CMakeLists.txt -+++ b/tdesktop-2.3.2-full-patched/cmake/external/ranges/CMakeLists.txt +--- a/cmake/external/ranges/CMakeLists.txt ++++ b/cmake/external/ranges/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(external_ranges INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_ranges ALIAS external_ranges) @@ -44,10 +38,8 @@ index 5a584dd..9b9049f 100644 -endif() \ No newline at end of file +endif() -diff --git a/tdesktop-2.3.2-full/cmake/external/webrtc/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/webrtc/CMakeLists.txt -index 1273291..1dd8ae6 100644 ---- a/tdesktop-2.3.2-full/cmake/external/webrtc/CMakeLists.txt -+++ b/tdesktop-2.3.2-full-patched/cmake/external/webrtc/CMakeLists.txt +--- a/cmake/external/webrtc/CMakeLists.txt ++++ b/cmake/external/webrtc/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(external_webrtc INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_webrtc ALIAS external_webrtc) @@ -57,3 +49,14 @@ index 1273291..1dd8ae6 100644 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) diff --git a/0003-prioritize-gtk2.patch b/0003-prioritize-gtk2.patch index b5d953a..d3709fb 100644 --- a/0003-prioritize-gtk2.patch +++ b/0003-prioritize-gtk2.patch @@ -1,19 +1,19 @@ diff --git a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp -index bafd075..315bab7 100644 +index 1b78bac..09c2ede 100644 --- a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp +++ b/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp -@@ -239,12 +239,12 @@ void GtkIntegration::load() { +@@ -475,12 +475,12 @@ void GtkIntegration::load(const QString &allowedBackends, bool force) { DEBUG_LOG(("Icon theme: %1").arg(QIcon::themeName())); DEBUG_LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); - if (LoadGtkLibrary(_lib, "gtk-3", 0)) { + if (LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) { - Loaded = SetupGtkBase(_lib); + _private->loaded = _private->setupBase(_lib, allowedBackends); } - if (!Loaded - && !TriedToInit + if (!_private->loaded + && !_private->triedToInit - && LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) { + && LoadGtkLibrary(_lib, "gtk-3", 0)) { - Loaded = SetupGtkBase(_lib); + _private->loaded = _private->setupBase(_lib, allowedBackends); } diff --git a/0004-use-dynamic-x-libraries.patch b/0004-use-dynamic-x-libraries.patch new file mode 100644 index 0000000..1e7e590 --- /dev/null +++ b/0004-use-dynamic-x-libraries.patch @@ -0,0 +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 diff --git a/0005-add-wayland-include-path.patch b/0005-add-wayland-include-path.patch new file mode 100644 index 0000000..e77e89c --- /dev/null +++ b/0005-add-wayland-include-path.patch @@ -0,0 +1,10 @@ +--- a/Telegram/lib_waylandshells/waylandshells/xdg-shell/CMakeLists.txt ++++ b/Telegram/lib_waylandshells/waylandshells/xdg-shell/CMakeLists.txt +@@ -45,6 +45,7 @@ + target_include_directories(lib_waylandshells_xdg_shell + PRIVATE + ${src_loc} ++ /usr/include/wayland + ${CMAKE_CURRENT_BINARY_DIR} + ) + diff --git a/tdesktop-2.7.5-full.tar.gz b/tdesktop-2.7.5-full.tar.gz deleted file mode 100644 index 2bce9f6..0000000 --- a/tdesktop-2.7.5-full.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f46c41c398a2f4cbac8eaec3dca31ffcfe4103887af741205d16e1ca71f03bdf -size 36898903 diff --git a/tdesktop-2.9.0-full.tar.gz b/tdesktop-2.9.0-full.tar.gz new file mode 100644 index 0000000..1b4b55f --- /dev/null +++ b/tdesktop-2.9.0-full.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5 +size 37327425 diff --git a/telegram-desktop.changes b/telegram-desktop.changes index fd3272e..abc448a 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Aug 2 03:04:38 UTC 2021 - Xu Zhao + +- Update to 2.9.0 + * Enable auto-delete in your chats to remove messages. + * Quickly find all GIFs from a chat using the new GIF section. + * Reset your Two-Step Verification password even if you forgot. + * Enjoy a new app icon and default background. +- Update tg_owt +- Update 0001-use-bundled-ranged-exptected-gsl.patch + * Use bundled rlottie +- Add 0004-use-dynamic-x-libraries.patch +- Add 0005-add-wayland-include-path.patch + ------------------------------------------------------------------- Sat Jun 5 03:02:08 UTC 2021 - Xu Zhao diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 0d6183b..e30f5ba 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -30,7 +30,7 @@ %define _dwz_max_die_limit 200000000 Name: telegram-desktop -Version: 2.7.5 +Version: 2.9.0 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only @@ -45,6 +45,10 @@ Patch1: 0001-use-bundled-ranged-exptected-gsl.patch Patch2: 0002-tg_owt-fix-name-confliction.patch # PATCH-FIX-OPENSUSE boo#1149986 Patch3: 0003-prioritize-gtk2.patch +# PATCH-FIX-OPENSUSE +Patch4: 0004-use-dynamic-x-libraries.patch +# PATCH-FIX-OPENSUSE +Patch5: 0005-add-wayland-include-path.patch # There is an (incomplete) patch available for part of the source: # https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4 # but tdesktop itself still falls short, and it looks to be something @@ -74,6 +78,7 @@ BuildRequires: libwebrtc_audio_processing-devel BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: unzip +BuildRequires: wayland-devel BuildRequires: webkit2gtk3-devel BuildRequires: xorg-x11-devel BuildRequires: xxhash-devel @@ -95,6 +100,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(jemalloc) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavfilter) @@ -124,6 +130,7 @@ BuildRequires: pkgconfig(opusfile) BuildRequires: pkgconfig(opusurl) BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(portaudiocpp) +BuildRequires: pkgconfig(rnnoise) BuildRequires: pkgconfig(tslib) BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(xcb-ewmh) @@ -155,8 +162,10 @@ The service also provides APIs to independent developers. %prep %setup -q -n tdesktop-%{version}-full -%patch1 -p2 +%patch1 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 cd ../ unzip -q %{S:1} diff --git a/tg_owt-master.zip b/tg_owt-master.zip index d241425..ddb0271 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:3bf8d5c0cc58a95ccf4217808915f37166e50e53ba7d8cd2f95d15dc3bf9526e -size 28726219 +oid sha256:5cd9d4bab869cc61f0575e6e2e5dbcce2591912fe0b5e10c1b4e9bc6e5f2c69c +size 31285834