7:04 p.m.
commit a3b14aa8d0f9e4ea0b57e457d79fbfaabc0ce98d
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Mar 11 20:01:08 2022 +0100
Updated to version 3.6.0.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-ffmpeg5.patch | 155 ------------------------
telegram-desktop-unbundled-kwayland-stuff.patch | 45 +++----
telegram-desktop.spec | 14 +--
5 files changed, 24 insertions(+), 193 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc79419..40955d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,3 +173,4 @@
/tdesktop-3.4.8-full.tar.gz
/tdesktop-3.5.1-full.tar.gz
/tdesktop-3.5.2-full.tar.gz
+/tdesktop-3.6.0-full.tar.gz
diff --git a/sources b/sources
index fb8b6ee..7b3fd23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-3.5.2-full.tar.gz) =
adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
+SHA512 (tdesktop-3.6.0-full.tar.gz) =
e5d4278229dc6033e1d40509d54fe52844dd8bad036bfec1fb9683505c9a626e821c15a487db5f1be5951dd5ed0db3ff5a4cbcbba73627f5e527e88cb06925f3
diff --git a/telegram-desktop-unbundled-kwayland-stuff.patch
b/telegram-desktop-unbundled-kwayland-stuff.patch
index 990e55c..3a48177 100644
--- a/telegram-desktop-unbundled-kwayland-stuff.patch
+++ b/telegram-desktop-unbundled-kwayland-stuff.patch
@@ -1,6 +1,6 @@
--- a/cmake/external/kwayland/CMakeLists.txt
+++ b/cmake/external/kwayland/CMakeLists.txt
-@@ -20,62 +20,6 @@ add_library(external_kwayland_bundled STATIC IMPORTED)
+@@ -20,50 +20,6 @@ add_library(external_kwayland_bundled STATIC IMPORTED)
include(ExternalProject)
@@ -22,23 +22,11 @@
-ExternalProject_Get_property(extra-cmake-modules BINARY_DIR)
-set(extra_cmake_modules_binary_dir ${BINARY_DIR})
-
--ExternalProject_Add(wayland-protocols
-- URL ${third_party_loc}/wayland-protocols
-- CONFIGURE_COMMAND meson
-- --prefix=<BINARY_DIR>
-- --libdir=lib
-- --buildtype=release
-- -Dtests=false
-- <BINARY_DIR> <SOURCE_DIR>
-- BUILD_COMMAND meson compile -C <BINARY_DIR>
-- COMMAND meson install -C <BINARY_DIR>
-- STEP_TARGETS build
-- EXCLUDE_FROM_ALL TRUE
-- BUILD_BYPRODUCTS <BINARY_DIR>/share/pkgconfig/wayland-protocols.pc
--)
--
--ExternalProject_Get_property(wayland-protocols BINARY_DIR)
--set(wayland_protocols_binary_dir ${BINARY_DIR})
+-set(wayland_protocols_source_dir ${third_party_loc}/wayland-protocols)
+-file(READ "${wayland_protocols_source_dir}/meson.build"
wayland_protocols_meson_build)
+-string(REGEX MATCH "\n[ \t]*version: '([0-9.]+)'" _
${wayland_protocols_meson_build})
+-set(wayland_protocols_version ${CMAKE_MATCH_1})
+-configure_file("wayland-protocols.pc.in"
"${CMAKE_CURRENT_BINARY_DIR}/share/pkgconfig/wayland-protocols.pc" @ONLY)
-
-ExternalProject_Add(plasma-wayland-protocols
- URL ${third_party_loc}/plasma-wayland-protocols
@@ -60,27 +48,24 @@
-ExternalProject_Get_property(plasma-wayland-protocols BINARY_DIR)
-set(plasma_wayland_protocols_binary_dir ${BINARY_DIR})
-
- set(kwayland_patch_command)
- if (DESKTOP_APP_QT6)
- set(kwayland_patch_command PATCH_COMMAND patch -p1 <
${CMAKE_CURRENT_SOURCE_DIR}/kwayland-qt6.patch)
-@@ -88,9 +32,6 @@ ExternalProject_Add(kwayland
- -DCMAKE_BUILD_TYPE=Release
- -DBUILD_SHARED_LIBS=OFF
+ ExternalProject_Add(kwayland
+ URL ${third_party_loc}/kwayland
+ CMAKE_GENERATOR Ninja
+@@ -73,17 +29,11 @@ ExternalProject_Add(kwayland
-DBUILD_TESTING=OFF
-- -DCMAKE_PREFIX_PATH=${wayland_protocols_binary_dir}
+ -DBUILD_WITH_QT6=${DESKTOP_APP_QT6}
+ -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.91.0
+- -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}
- -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake
-
-DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols
- ${kwayland_patch_command}
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target KF5WaylandClient
STEP_TARGETS build
-@@ -98,9 +39,6 @@ ExternalProject_Add(kwayland
+ EXCLUDE_FROM_ALL TRUE
BUILD_BYPRODUCTS <BINARY_DIR>/lib/libKF5WaylandClient.a
)
-ExternalProject_Add_StepDependencies(kwayland configure extra-cmake-modules-build)
--ExternalProject_Add_StepDependencies(kwayland configure wayland-protocols-build)
-ExternalProject_Add_StepDependencies(kwayland configure plasma-wayland-protocols-build)
-
+-
ExternalProject_Get_property(kwayland SOURCE_DIR)
ExternalProject_Get_property(kwayland BINARY_DIR)
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index d922f77..0f3b163 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -24,8 +24,8 @@
%endif
Name: telegram-desktop
-Version: 3.5.2
-Release: 2%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -39,9 +39,6 @@ Source0:
%{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
# Downstream patches.
Patch0: %{name}-unbundled-kwayland-stuff.patch
-# https://github.com/telegramdesktop/tdesktop/pull/24044
-Patch100: %{name}-ffmpeg5.patch
-
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
ExclusiveArch: x86_64 aarch64
@@ -138,10 +135,10 @@ BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6WaylandClient)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: qt6-qtbase-static
-Provides: bundled(kf5-kwayland) = 5.90.0
+Provides: bundled(kf5-kwayland) = 5.91.0
%endif
BuildRequires: pkgconfig(wayland-client)
-BuildRequires: extra-cmake-modules >= 5.90.0
+BuildRequires: extra-cmake-modules >= 5.91.0
%endif
%if %{enable_x11}
@@ -268,6 +265,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.metainfo.xml
%changelog
+* Fri Mar 11 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.6.0-1
+- Updated to version 3.6.0.
+
* Wed Feb 16 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.5.2-2
- Rebuilt for Qt 6.2.3 update.