From 4ef308f6372f9ce93a30fd8ad988afc80c2acad5 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 7 Feb 2020 07:53:51 +0100 Subject: [PATCH] telegram-desktop: update to 1.9.12. --- .../patches/0003-PPC-config.patch | 28 ------------------- .../patches/rlottie-pkgconfig.patch | 14 ---------- srcpkgs/telegram-desktop/template | 9 ++++-- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/telegram-desktop/patches/0003-PPC-config.patch delete mode 100644 srcpkgs/telegram-desktop/patches/rlottie-pkgconfig.patch diff --git a/srcpkgs/telegram-desktop/patches/0003-PPC-config.patch b/srcpkgs/telegram-desktop/patches/0003-PPC-config.patch deleted file mode 100644 index 03273527b56..00000000000 --- a/srcpkgs/telegram-desktop/patches/0003-PPC-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Thu, 2 Jan 2020 12:58:45 +0100 -Subject: [PATCH] PPC config - ---- - base/build_config.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h -index a02c9b0..b3f4860 100644 ---- Telegram/lib_base/base/build_config.h -+++ Telegram/lib_base/base/build_config.h -@@ -46,9 +46,9 @@ - #define ARCH_CPU_X86_FAMILY 1 - #define ARCH_CPU_X86 1 - #define ARCH_CPU_32_BITS 1 --#elif defined(__aarch64__) -+#elif defined(__aarch64__) || defined(__powerpc64__) - #define ARCH_CPU_64_BITS 1 --#elif defined(_M_ARM) || defined(__arm__) -+#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__) - #define ARCH_CPU_32_BITS 1 - #else - #error Please add support for your architecture in base/build_config.h --- -2.24.1 - diff --git a/srcpkgs/telegram-desktop/patches/rlottie-pkgconfig.patch b/srcpkgs/telegram-desktop/patches/rlottie-pkgconfig.patch deleted file mode 100644 index 63eef054025..00000000000 --- a/srcpkgs/telegram-desktop/patches/rlottie-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/external/rlottie/CMakeLists.txt 2020-01-17 18:21:17.000000000 +0100 -+++ - 2020-01-18 00:37:40.280438388 +0100 -@@ -8,8 +8,9 @@ - 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) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(RLOTTIE REQUIRED rlottie) -+ target_link_libraries(external_rlottie INTERFACE ${RLOTTIE_LIBRARIES}) - else() - add_library(external_rlottie OBJECT) - add_library(desktop-app::external_rlottie ALIAS external_rlottie) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 1ffba39010a..3c1c691f2c3 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,6 +1,6 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=1.9.9 +version=1.9.12 revision=1 wrksrc="tdesktop-${version}-full" build_style=cmake @@ -12,12 +12,15 @@ configure_args="-DTDESKTOP_API_ID=209235 -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON + -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF + -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF + -DDESKTOP_APP_USE_PACKAGED_GSL=OFF -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')" hostmakedepends="pkg-config qt5-qmake qt5-host-tools python" makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel pulseaudio-devel qt5-devel range-v3 libva-devel rapidjson liblz4-devel liblzma-devel rlottie-devel - MesaLib-devel $(vopt_if spellcheck enchant2-devel)" + MesaLib-devel libdbusmenu-qt5-devel $(vopt_if spellcheck enchant2-devel)" depends="qt5-imageformats qt5>=5.13.2<5.13.3" short_desc="Telegram Desktop messaging app" maintainer="John " @@ -25,7 +28,7 @@ license="GPL-3.0-or-later WITH OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=260678b1e2c9638fa5d500880ddd9b6cd8338b1d235aee93c43ec9ab22a67d21 +checksum=a1cf578b1cd4bfa71d54f50349a0384c673083ad3d0a9c9dc1c4676ca0134ef6 build_options="spellcheck" build_options_default="spellcheck"