aboutsummaryrefslogtreecommitdiffstats
path: root/testing/telegram-desktop
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-02-06 17:36:46 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-02-06 17:40:57 +0100
commit3658b335b4ef8354956dd2b32873e0ce28f6de99 (patch)
treefde5200b53ee30074a833187140563246850e8b5 /testing/telegram-desktop
parent12d1b81ab3b0e9cd02b58f61c96ceb9263eac818 (diff)
downloadaports-3658b335b4ef8354956dd2b32873e0ce28f6de99.tar.gz
aports-3658b335b4ef8354956dd2b32873e0ce28f6de99.tar.bz2
aports-3658b335b4ef8354956dd2b32873e0ce28f6de99.tar.xz
testing/telegram-desktop: upgrade to 1.9.10
Diffstat (limited to 'testing/telegram-desktop')
-rw-r--r--testing/telegram-desktop/APKBUILD12
-rw-r--r--testing/telegram-desktop/no-system-parts.patch39
-rw-r--r--testing/telegram-desktop/ppc.patch16
3 files changed, 46 insertions, 21 deletions
diff --git a/testing/telegram-desktop/APKBUILD b/testing/telegram-desktop/APKBUILD
index 55d856ab25..6b0d9b669e 100644
--- a/testing/telegram-desktop/APKBUILD
+++ b/testing/telegram-desktop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leo <thinkabit.ukim@gmail.com>
# Contributor: Leo <thinkabit.ukim@gmail.com>
pkgname=telegram-desktop
-pkgver=1.9.9
+pkgver=1.9.10
pkgrel=0
pkgdesc="Telegram Desktop messaging app"
options="!check" # Requires Catch2 to be packaged.
@@ -36,12 +36,14 @@ makedepends="
enchant2-dev
range-v3-dev
python3
+ libdbusmenu-qt-dev
+ tl-expected
"
source="
https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz
musl-basename.patch
- ppc.patch
qt-plugin-path.patch
+ no-system-parts.patch
"
builddir="$srcdir/tdesktop-$pkgver-full"
@@ -88,7 +90,7 @@ package() {
done
}
-sha512sums="ba6400e6f5eec5bda6e8a54b43846e695b2cce731cb6b39f17407cc39e3e9b8078d977253d29962671f30e33dbe012f8e40f340f781fd8ca73487e5f2d42e3de tdesktop-1.9.9-full.tar.gz
+sha512sums="128dc3fd42196ebf61853917914c3d33fb148d3e6b04847ffa6d4df5baa8d9e286e7d25317b0dd2a332f1475f60b5addd19bb6e25a0fa6bbca316c22235569c6 tdesktop-1.9.10-full.tar.gz
6062602d02e20917c06f17d12bb21bd4a94b23c2a6744a8a05c2c93d41747ba413e110edd344ecd130c28ebaf997ae46b347d239e69f5856ead42318bd5b01cd musl-basename.patch
-9a3e491e2b2a9ea3f15da3766a2d743bafead7ae1e6a6ca3e6e9c7352dc268221311acd73664e5452622e2bc91cc88a2a7d3b4ebe6634b4da74c54b3bde0bb7f ppc.patch
-183767e9a291dd605797cdc46382d8cb6a73a342348a40df7d52864ea27b3aa8709808cd51c46f5e611c247229ed336cb569bed1185c4c97b03171b56bbe5653 qt-plugin-path.patch"
+183767e9a291dd605797cdc46382d8cb6a73a342348a40df7d52864ea27b3aa8709808cd51c46f5e611c247229ed336cb569bed1185c4c97b03171b56bbe5653 qt-plugin-path.patch
+8f755b797676f56313f3355f7442665f7f03a7a8c1339ef1ab1790db11c0f48ab02b62a6240146772580022305125ffe927b11c94ba711cf7884c9cc4a1f123b no-system-parts.patch"
diff --git a/testing/telegram-desktop/no-system-parts.patch b/testing/telegram-desktop/no-system-parts.patch
new file mode 100644
index 0000000000..c7d9624177
--- /dev/null
+++ b/testing/telegram-desktop/no-system-parts.patch
@@ -0,0 +1,39 @@
+diff --git a/cmake/external/gsl/CMakeLists.txt b/cmake/external/gsl/CMakeLists.txt
+index aa8b09a..0bbfb8e 100644
+--- a/cmake/external/gsl/CMakeLists.txt
++++ b/cmake/external/gsl/CMakeLists.txt
+@@ -7,15 +7,7 @@
+ add_library(external_gsl INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_gsl ALIAS external_gsl)
+
+-if (DESKTOP_APP_USE_PACKAGED)
+- find_path(GSL_INCLUDE_DIRS gsl/gsl)
+-
+- if (NOT GSL_INCLUDE_DIRS)
+- message(FATAL_ERROR "Guidelines Support Library not found")
+- endif()
+-else()
+ target_include_directories(external_gsl SYSTEM
+ INTERFACE
+ ${third_party_loc}/GSL/include
+ )
+-endif()
+diff --git a/cmake/external/variant/CMakeLists.txt b/cmake/external/variant/CMakeLists.txt
+index a198f90..88a1d4c 100644
+--- a/cmake/external/variant/CMakeLists.txt
++++ b/cmake/external/variant/CMakeLists.txt
+@@ -7,14 +7,7 @@
+ add_library(external_variant INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_variant ALIAS external_variant)
+
+-if (DESKTOP_APP_USE_PACKAGED_VARIANT)
+- find_path(VARIANT_INCLUDE_DIRS mapbox/variant.hpp)
+- if (NOT VARIANT_INCLUDE_DIRS)
+- message(FATAL_ERROR "Packaged version of mapbox-variant library not found!")
+- endif()
+-else()
+ target_include_directories(external_variant SYSTEM
+ INTERFACE
+ ${third_party_loc}/variant/include
+ )
+-endif()
diff --git a/testing/telegram-desktop/ppc.patch b/testing/telegram-desktop/ppc.patch
deleted file mode 100644
index 1b29005ada..0000000000
--- a/testing/telegram-desktop/ppc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Telegram/lib_base/base/build_config.h b/Telegram/lib_base/base/build_config.h
-index a02c9b0..b3f4860 100644
---- a/Telegram/lib_base/base/build_config.h
-+++ b/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