rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 909652 from home:nuklly:branches:server:messaging

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/909652
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=199
This commit is contained in:
Marcel Kuehlhorn 2021-08-02 08:35:57 +00:00 committed by Git OBS Bridge
parent f8a41952da
commit 16ed77b8da
9 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-use-bundled-ranged-exptected-gsl.patch
View File

@ -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 --- a/cmake/external/expected/CMakeLists.txt
index 10c2c26..fddfbb4 100644 +++ b/cmake/external/expected/CMakeLists.txt
--- a/tdesktop-2.3.2-full/cmake/external/expected/CMakeLists.txt
+++ b/tdesktop-2.3.2-full-patched/cmake/external/expected/CMakeLists.txt
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
add_library(external_expected INTERFACE IMPORTED GLOBAL) add_library(external_expected INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_expected ALIAS external_expected) add_library(desktop-app::external_expected ALIAS external_expected)
@ -11,10 +9,8 @@ index 10c2c26..fddfbb4 100644
if (DESKTOP_APP_USE_PACKAGED_LAZY) if (DESKTOP_APP_USE_PACKAGED_LAZY)
find_package(tl-expected QUIET) find_package(tl-expected QUIET)
else() 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 --- a/cmake/external/gsl/CMakeLists.txt
index b03be4f..80c0e07 100644 +++ b/cmake/external/gsl/CMakeLists.txt
--- a/tdesktop-2.3.2-full/cmake/external/gsl/CMakeLists.txt
+++ b/tdesktop-2.3.2-full-patched/cmake/external/gsl/CMakeLists.txt
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
add_library(external_gsl INTERFACE IMPORTED GLOBAL) add_library(external_gsl INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_gsl ALIAS external_gsl) add_library(desktop-app::external_gsl ALIAS external_gsl)
@ -24,10 +20,8 @@ index b03be4f..80c0e07 100644
if (DESKTOP_APP_USE_PACKAGED_LAZY) if (DESKTOP_APP_USE_PACKAGED_LAZY)
find_package(Microsoft.GSL QUIET) find_package(Microsoft.GSL QUIET)
else() 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 --- a/cmake/external/ranges/CMakeLists.txt
index 5a584dd..9b9049f 100644 +++ b/cmake/external/ranges/CMakeLists.txt
--- a/tdesktop-2.3.2-full/cmake/external/ranges/CMakeLists.txt
+++ b/tdesktop-2.3.2-full-patched/cmake/external/ranges/CMakeLists.txt
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
add_library(external_ranges INTERFACE IMPORTED GLOBAL) add_library(external_ranges INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_ranges ALIAS external_ranges) add_library(desktop-app::external_ranges ALIAS external_ranges)
@ -44,10 +38,8 @@ index 5a584dd..9b9049f 100644
-endif() -endif()
\ No newline at end of file \ No newline at end of file
+endif() +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 --- a/cmake/external/webrtc/CMakeLists.txt
index 1273291..1dd8ae6 100644 +++ b/cmake/external/webrtc/CMakeLists.txt
--- a/tdesktop-2.3.2-full/cmake/external/webrtc/CMakeLists.txt
+++ b/tdesktop-2.3.2-full-patched/cmake/external/webrtc/CMakeLists.txt
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
add_library(external_webrtc INTERFACE IMPORTED GLOBAL) add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_webrtc ALIAS external_webrtc) add_library(desktop-app::external_webrtc ALIAS external_webrtc)
@ -57,3 +49,14 @@ index 1273291..1dd8ae6 100644
find_package(tg_owt REQUIRED) find_package(tg_owt REQUIRED)
target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
else() 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)

12
0003-prioritize-gtk2.patch
View File

@ -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 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 --- a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.cpp
+++ b/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(("Icon theme: %1").arg(QIcon::themeName()));
DEBUG_LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); DEBUG_LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
- if (LoadGtkLibrary(_lib, "gtk-3", 0)) { - if (LoadGtkLibrary(_lib, "gtk-3", 0)) {
+ if (LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) { + if (LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) {
Loaded = SetupGtkBase(_lib); _private->loaded = _private->setupBase(_lib, allowedBackends);
} }
if (!Loaded if (!_private->loaded
&& !TriedToInit && !_private->triedToInit
- && LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) { - && LoadGtkLibrary(_lib, "gtk-x11-2.0", 0)) {
+ && LoadGtkLibrary(_lib, "gtk-3", 0)) { + && LoadGtkLibrary(_lib, "gtk-3", 0)) {
Loaded = SetupGtkBase(_lib); _private->loaded = _private->setupBase(_lib, allowedBackends);
} }

11
0004-use-dynamic-x-libraries.patch Normal file
View File

@ -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

10
0005-add-wayland-include-path.patch Normal file
View File

@ -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}
)

3
tdesktop-2.7.5-full.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f46c41c398a2f4cbac8eaec3dca31ffcfe4103887af741205d16e1ca71f03bdf
size 36898903

3
tdesktop-2.9.0-full.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
size 37327425

14
telegram-desktop.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Aug 2 03:04:38 UTC 2021 - Xu Zhao <i@xuzhao.net>
- 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 <i@xuzhao.net> Sat Jun 5 03:02:08 UTC 2021 - Xu Zhao <i@xuzhao.net>

13
telegram-desktop.spec
View File

@ -30,7 +30,7 @@
%define _dwz_max_die_limit 200000000 %define _dwz_max_die_limit 200000000
Name: telegram-desktop Name: telegram-desktop
Version: 2.7.5 Version: 2.9.0
Release: 0 Release: 0
Summary: Messaging application with a focus on speed and security Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only 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 Patch2: 0002-tg_owt-fix-name-confliction.patch
# PATCH-FIX-OPENSUSE boo#1149986 # PATCH-FIX-OPENSUSE boo#1149986
Patch3: 0003-prioritize-gtk2.patch 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: # There is an (incomplete) patch available for part of the source:
# https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4 # https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something # but tdesktop itself still falls short, and it looks to be something
@ -74,6 +78,7 @@ BuildRequires: libwebrtc_audio_processing-devel
BuildRequires: ninja BuildRequires: ninja
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: unzip BuildRequires: unzip
BuildRequires: wayland-devel
BuildRequires: webkit2gtk3-devel BuildRequires: webkit2gtk3-devel
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: xxhash-devel BuildRequires: xxhash-devel
@ -95,6 +100,7 @@ BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(jemalloc)
BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavdevice)
BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(libavfilter)
@ -124,6 +130,7 @@ BuildRequires: pkgconfig(opusfile)
BuildRequires: pkgconfig(opusurl) BuildRequires: pkgconfig(opusurl)
BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(portaudiocpp) BuildRequires: pkgconfig(portaudiocpp)
BuildRequires: pkgconfig(rnnoise)
BuildRequires: pkgconfig(tslib) BuildRequires: pkgconfig(tslib)
BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-ewmh)
@ -155,8 +162,10 @@ The service also provides APIs to independent developers.
%prep %prep
%setup -q -n tdesktop-%{version}-full %setup -q -n tdesktop-%{version}-full
%patch1 -p2 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
cd ../ cd ../
unzip -q %{S:1} unzip -q %{S:1}

4
tg_owt-master.zip
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3bf8d5c0cc58a95ccf4217808915f37166e50e53ba7d8cd2f95d15dc3bf9526e oid sha256:5cd9d4bab869cc61f0575e6e2e5dbcce2591912fe0b5e10c1b4e9bc6e5f2c69c
size 28726219 size 31285834