From e675299d3689db9ce71ca6511bbf2995a6953c89ee27b6731f67b1f9a59e73c0 Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Thu, 30 Jan 2020 09:20:05 +0000 Subject: [PATCH] Accepting request 768252 from home:tux93 - Update to 1.9.9 * Bug fixes and other minor improvements. - Removed 0002-use-bundled-rlottie.patch, there's a cmake switch for this - Add cmake version requirement OBS-URL: https://build.opensuse.org/request/show/768252 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=122 --- 0002-use-bundled-rlottie.patch | 21 --------------------- tdesktop-1.9.8-full.tar.gz | 3 --- tdesktop-1.9.9-full.tar.gz | 3 +++ telegram-desktop.changes | 9 +++++++++ telegram-desktop.spec | 7 +++---- 5 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 0002-use-bundled-rlottie.patch delete mode 100644 tdesktop-1.9.8-full.tar.gz create mode 100644 tdesktop-1.9.9-full.tar.gz diff --git a/0002-use-bundled-rlottie.patch b/0002-use-bundled-rlottie.patch deleted file mode 100644 index 2de4951..0000000 --- a/0002-use-bundled-rlottie.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/cmake/external/rlottie/CMakeLists.txt.orig 2020-01-17 22:04:09.334361126 +0100 -+++ b/cmake/external/rlottie/CMakeLists.txt 2020-01-17 22:04:58.239214120 +0100 -@@ -4,13 +4,6 @@ - # For license and copyright information please follow this link: - # https://github.com/desktop-app/legal/blob/master/LEGAL - --if (DESKTOP_APP_USE_PACKAGED_RLOTTIE) -- add_library(external_rlottie INTERFACE IMPORTED GLOBAL) -- add_library(desktop-app::external_rlottie ALIAS external_rlottie) -- -- find_package(rlottie REQUIRED) -- target_link_libraries(external_rlottie INTERFACE rlottie::rlottie) --else() - add_library(external_rlottie OBJECT) - add_library(desktop-app::external_rlottie ALIAS external_rlottie) - init_target(external_rlottie "(external)") -@@ -123,4 +116,3 @@ else() - /w44251 # needs to have dll-interface to be used by clients of class - ) - endif() --endif() diff --git a/tdesktop-1.9.8-full.tar.gz b/tdesktop-1.9.8-full.tar.gz deleted file mode 100644 index 7c60f72..0000000 --- a/tdesktop-1.9.8-full.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dcf14cff65777a176a4552b982e67fa802668f29d212025b0c05342010a03e7 -size 25225784 diff --git a/tdesktop-1.9.9-full.tar.gz b/tdesktop-1.9.9-full.tar.gz new file mode 100644 index 0000000..3321cb3 --- /dev/null +++ b/tdesktop-1.9.9-full.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:260678b1e2c9638fa5d500880ddd9b6cd8338b1d235aee93c43ec9ab22a67d21 +size 25221934 diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 796bde6..1d90aad 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jan 29 07:58:21 UTC 2020 - Marcel Kuehlhorn + +- Update to 1.9.9 + * Bug fixes and other minor improvements. +- Removed 0002-use-bundled-rlottie.patch, + there's a cmake switch for this +- Add cmake version requirement + ------------------------------------------------------------------- Fri Jan 24 17:48:01 UTC 2020 - Marcel Kuehlhorn diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 9b6845c..c39cda4 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -24,7 +24,7 @@ %define __builder ninja Name: telegram-desktop -Version: 1.9.8 +Version: 1.9.9 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only @@ -35,10 +35,9 @@ Source0: https://github.com/telegramdesktop/tdesktop/releases/download/v% Source1: range-v3-master.zip Patch0: 0000-gtk2-default.patch Patch1: 0001-use-bundled-range.patch -Patch2: 0002-use-bundled-rlottie.patch BuildRequires: appstream-glib BuildRequires: chrpath -BuildRequires: cmake +BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils BuildRequires: enchant-devel BuildRequires: ffmpeg-devel @@ -135,7 +134,6 @@ mv %{_builddir}/Libraries/range-v3-master %{_builddir}/Libraries/range-v3 %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %limit_build -m 2048 @@ -148,6 +146,7 @@ mv %{_builddir}/Libraries/range-v3-master %{_builddir}/Libraries/range-v3 -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \ -DDESKTOP_APP_USE_PACKAGED=ON \ -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ + -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \ -DDESKTOP_APP_USE_PACKAGED_FONTS=ON \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DTDESKTOP_DISABLE_AUTOUPDATE=ON \