aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-02-11 17:41:34 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-02-11 19:02:49 -0300
commit6aadaa55142bc6d1e2c2baa5ff44bf5af5e1e3c7 (patch)
tree2154b7789562b2ba35a81d770c1a99139024785e /testing
parent7f1f57ae5cda2491bbf0a6f597341dd71c8bb05b (diff)
downloadaports-6aadaa55142bc6d1e2c2baa5ff44bf5af5e1e3c7.tar.gz
aports-6aadaa55142bc6d1e2c2baa5ff44bf5af5e1e3c7.tar.bz2
aports-6aadaa55142bc6d1e2c2baa5ff44bf5af5e1e3c7.tar.xz
testing/telegram-desktop: upgrade to 1.9.12
Diffstat (limited to 'testing')
-rw-r--r--testing/telegram-desktop/APKBUILD10
-rw-r--r--testing/telegram-desktop/no-system-parts.patch39
2 files changed, 5 insertions, 44 deletions
diff --git a/testing/telegram-desktop/APKBUILD b/testing/telegram-desktop/APKBUILD
index 6b0d9b669e..c8a8e242b0 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.10
+pkgver=1.9.12
pkgrel=0
pkgdesc="Telegram Desktop messaging app"
options="!check" # Requires Catch2 to be packaged.
@@ -43,7 +43,6 @@ source="
https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz
musl-basename.patch
qt-plugin-path.patch
- no-system-parts.patch
"
builddir="$srcdir/tdesktop-$pkgver-full"
@@ -66,6 +65,8 @@ build() {
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-DTDESKTOP_LAUNCHER_BASENAME=telegram-desktop \
-DTDESKTOP_FORCE_GTK_FILE_DIALOG=ON \
+ -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \
+ -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
${CMAKE_CROSSOPTS} .
ninja -C build
}
@@ -90,7 +91,6 @@ package() {
done
}
-sha512sums="128dc3fd42196ebf61853917914c3d33fb148d3e6b04847ffa6d4df5baa8d9e286e7d25317b0dd2a332f1475f60b5addd19bb6e25a0fa6bbca316c22235569c6 tdesktop-1.9.10-full.tar.gz
+sha512sums="11b6be5fa4db95a8b329b492edcdeca2cf834c274a86a26fac3e62254649e5767da6b2442eff6f7b48b975f4b319fee46d10e9430e28a3ef080146a8deb3bfb2 tdesktop-1.9.12-full.tar.gz
6062602d02e20917c06f17d12bb21bd4a94b23c2a6744a8a05c2c93d41747ba413e110edd344ecd130c28ebaf997ae46b347d239e69f5856ead42318bd5b01cd musl-basename.patch
-183767e9a291dd605797cdc46382d8cb6a73a342348a40df7d52864ea27b3aa8709808cd51c46f5e611c247229ed336cb569bed1185c4c97b03171b56bbe5653 qt-plugin-path.patch
-8f755b797676f56313f3355f7442665f7f03a7a8c1339ef1ab1790db11c0f48ab02b62a6240146772580022305125ffe927b11c94ba711cf7884c9cc4a1f123b no-system-parts.patch"
+183767e9a291dd605797cdc46382d8cb6a73a342348a40df7d52864ea27b3aa8709808cd51c46f5e611c247229ed336cb569bed1185c4c97b03171b56bbe5653 qt-plugin-path.patch"
diff --git a/testing/telegram-desktop/no-system-parts.patch b/testing/telegram-desktop/no-system-parts.patch
deleted file mode 100644
index c7d9624177..0000000000
--- a/testing/telegram-desktop/no-system-parts.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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()