aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-05-12 06:14:57 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-06-07 02:34:14 -0300
commitccfe3c11f6243774fa64ba64623fcb52a461d37c (patch)
tree89a2a3f9f43ee7f64d5e1c8334c9c75b3ef078e6
parent70722320804ded6f34570f0e82d5a1c80033fc44 (diff)
downloadaports-ccfe3c11f6243774fa64ba64623fcb52a461d37c.tar.gz
aports-ccfe3c11f6243774fa64ba64623fcb52a461d37c.tar.bz2
aports-ccfe3c11f6243774fa64ba64623fcb52a461d37c.tar.xz
testing/telegram-desktop: upgrade to 1.7.0
-rw-r--r--testing/telegram-desktop/APKBUILD12
-rw-r--r--testing/telegram-desktop/Telegram.cmake11
2 files changed, 15 insertions, 8 deletions
diff --git a/testing/telegram-desktop/APKBUILD b/testing/telegram-desktop/APKBUILD
index 77770120c5..2d72955c3e 100644
--- a/testing/telegram-desktop/APKBUILD
+++ b/testing/telegram-desktop/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer:
+# Maintainer: Leo <thinkabit.ukim@gmail.com>
# Contributor: Leo <thinkabit.ukim@gmail.com>
pkgname=telegram-desktop
-pkgver=1.6.7
+pkgver=1.7.0
# https://github.com/telegramdesktop/tdesktop/blob/v$pkgver/docs/building-cmake.md
_libtgvoip_commit=e7010506210fbb3a6704d7ac1276b3334f9ab6c9
_GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="Telegram Desktop messaging app"
options="!check" # Requires Catch2 to be packaged.
url="https://desktop.telegram.org/"
-arch="all !s390x"
+arch="all !s390x !armhf !armv7" # ARM are failing due to range-v3
license="GPL-3.0-or-later WITH OpenSSL"
depends="qt5-qtimageformats"
makedepends="cmake
@@ -61,8 +61,6 @@ source="
builddir="$srcdir/tdesktop-$pkgver"
prepare() {
- cd "$builddir"
-
rmdir Telegram/ThirdParty/libtgvoip
rmdir Telegram/ThirdParty/GSL
rmdir Telegram/ThirdParty/variant
@@ -140,7 +138,7 @@ package() {
done
}
-sha512sums="1292b686e47c82f7670e1a528092222c8a61532a9ed64d0e4d3879fa95037b284aa40a956ac1c6739262c4fdf22fb5e9492f6747e971668297cca142a51c5b46 telegram-desktop-1.6.7.tar.gz
+sha512sums="6cf66bf46483b0cfee61a1efb37361c839c24db9d572686775c60004660acd76f9c55d7293771054840f3579e48152240ae4f187dab5b5d1132bb85fb0300545 telegram-desktop-1.7.0.tar.gz
a8ef97da8ab50fdbb166933b8e8fd7b6d7db95a95dcdcd92f6882e1f1104e283a6dece5cf4c40bd8d56738efac3e3905bb403287ede2ec2dc5ace3815df4b097 libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9.tar.gz
83560cb0c39b6a4781e916c6081ad2728296e1b19760ca1b6426a8431fb6d7093760a882c539dd77152f5892fe081b1795af6366ea91385bb10aba6adf27170f GSL-d846fe50a3f0bb7767c7e087a05f4be95f4da0ec.tar.gz
537ce0a1731274da63a5be063311f7113c1391081e43970663a994b82a7b2e860302406c2931184789661d86343b2c60064c7014b73dc42799573f5b93bc12ff variant-550ac2f159ca883d360c196149b466955c77a573.tar.gz
@@ -152,7 +150,7 @@ cb01655dd097b68e89b15e6e4b1f6da10c52e8bec681eeef9807ca376283b10cb3da34acc976c790
3647ad5fff6326ba9c75fa98189a08c0909af8d1c2b704c8c62fd9da6603f5162af3176c37daa67eb5896bebe3814bf1fd66b9e93c78cbd9b439e472d0db4b44 ppc64le-enable-arch.patch
ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653 system-wide-fonts.patch
8b75da50a8212cd7c77e497ad5a49290e2656a2e01037d179cd6270105337a9adb238814f98bdf7a3e954ce8661dc3183a7400533067f9a21e38133a6628563a FindBreakpad.cmake
-485133c447b3414c60e94c074639404768798ec6993095ed108c3b927b6fd423dfee0b68c5c3e12e0d87cc1e53042ab1e76641290c2f71fb29db21245013d72f Telegram.cmake
+dc0a87356b3e06efc64fc9bdd27a7172454b769d2f615b15fa1f1594d51908d37127932fd1765be71d7391fe4b2c1f6a245c3893c7c0979144ba48e1bab1a38b Telegram.cmake
56aaf0e35ba1989d463ffa2699e7c0a7235168599f0720f66ff159f03541920e04e5944554b4d1b3a0893cf4581ff50ff00600b54522d24d59fa7192e4f80c0a TelegramCodegen.cmake
f6e42004d36c69497fd635f1bbd9779027fef1b44fc506cba85ff19c5e49e6b41008782ffb65d59ef4acef78dc0a671c285789ae21cb7a67a9b215c28a2c2eeb TelegramCodegenTools.cmake
4726ba77330d61f952c7e5af82454cc5536cd92634150406ea5dbc303acfd1d33093334b9b04cf06aa4adca84d97553f28b44dcc554d10af8052352f265c9505 TelegramTests.cmake
diff --git a/testing/telegram-desktop/Telegram.cmake b/testing/telegram-desktop/Telegram.cmake
index f389bbc287..e4e83306c4 100644
--- a/testing/telegram-desktop/Telegram.cmake
+++ b/testing/telegram-desktop/Telegram.cmake
@@ -90,7 +90,6 @@ file(GLOB FLAT_SOURCE_FILES
SourceFiles/core/*.cpp
SourceFiles/data/*.cpp
SourceFiles/dialogs/*.cpp
- SourceFiles/history/*.cpp
SourceFiles/inline_bots/*.cpp
SourceFiles/intro/*.cpp
SourceFiles/lang/*.cpp
@@ -113,7 +112,9 @@ file(GLOB FLAT_EXTRA_FILES
SourceFiles/passport/passport_form_row.cpp
SourceFiles/storage/*_tests.cpp
SourceFiles/storage/*_win.cpp
+ SourceFiles/storage/storage_feed_messages.cpp
SourceFiles/storage/cache/*_tests.cpp
+ SourceFiles/data/data_feed_messages.cpp
)
list(REMOVE_ITEM FLAT_SOURCE_FILES ${FLAT_EXTRA_FILES})
@@ -127,6 +128,13 @@ file(GLOB_RECURSE SUBDIRS_SOURCE_FILES
SourceFiles/window/*.cpp
)
+file(GLOB SUBDIRS_EXTRA_FILES
+ SourceFiles/info/feed/*.cpp
+ SourceFiles/info/channels/*.cpp
+ SourceFiles/history/feed/*.cpp
+)
+list(REMOVE_ITEM SUBDIRS_SOURCE_FILES ${SUBDIRS_EXTRA_FILES})
+
add_executable(Telegram WIN32 ${QRC_FILES} ${FLAT_SOURCE_FILES} ${SUBDIRS_SOURCE_FILES})
set(TELEGRAM_COMPILE_DEFINITIONS
@@ -239,3 +247,4 @@ endif()
install(TARGETS Telegram RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${CMAKE_SOURCE_DIR}/../lib/xdg/telegramdesktop.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+