aboutsummaryrefslogtreecommitdiffstats
path: root/testing/telegram-desktop
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-06-17 12:30:06 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-06-19 11:19:10 -0300
commit88d2768c9c0d04b848b854c7aea4677100706e3f (patch)
treefc6ee2ecec542b2068a4e5d6a8abcb7dfc97a7e7 /testing/telegram-desktop
parente47b327a5cca7fc6a3ed1b67ebac4fa652b51042 (diff)
downloadaports-88d2768c9c0d04b848b854c7aea4677100706e3f.tar.bz2
aports-88d2768c9c0d04b848b854c7aea4677100706e3f.tar.xz
testing/telegram-desktop: upgrade to 1.7.7
Diffstat (limited to 'testing/telegram-desktop')
-rw-r--r--testing/telegram-desktop/APKBUILD14
-rw-r--r--testing/telegram-desktop/PrecompiledHeader-cmake.patch10
-rw-r--r--testing/telegram-desktop/Telegram.cmake8
-rw-r--r--testing/telegram-desktop/ThirdParty-qtlottie.cmake32
4 files changed, 43 insertions, 21 deletions
diff --git a/testing/telegram-desktop/APKBUILD b/testing/telegram-desktop/APKBUILD
index b6f7a11c72..1b5cdca41d 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.7.3
+pkgver=1.7.7
# https://github.com/telegramdesktop/tdesktop/blob/v$pkgver/docs/building-cmake.md
_libtgvoip_commit=a19a0aff644127d8089f6a4ac18119ec5247dbd0
_GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -123,8 +123,8 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS" \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS -O2" \
+ -DCMAKE_C_FLAGS="$CFLAGS -O2" \
-DENABLE_PULSEAUDIO=OFF \
-DENABLE_CRASH_REPORTS=OFF \
-DENABLE_GTK_INTEGRATION=OFF \
@@ -149,7 +149,7 @@ package() {
done
}
-sha512sums="b94fdf2e4b6d5f21a5ffe54a0c34ef15597b1335204511ab96f40caa852c8e6ed175811d839dcbb594cd5a93490f8095a71d77fceb1a03f497030c852e1559a0 telegram-desktop-1.7.3.tar.gz
+sha512sums="abca4e815dc017c1dbb062ab87d166203678b9ffc08fb71f96626172bcebeb52ed60c921dfbaf7301cb8e344b7670a05d4bb9275a511219f33668988a0c79b6b telegram-desktop-1.7.7.tar.gz
9d7826d0996d39dcaf1f56bdd418251b3bc39ebf9ec662280a01dea97deeb02b784b69de4e0421791cda7a18680d26437fbe9d0c965c13a2b0cb971a0b3f511f libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0.tar.gz
83560cb0c39b6a4781e916c6081ad2728296e1b19760ca1b6426a8431fb6d7093760a882c539dd77152f5892fe081b1795af6366ea91385bb10aba6adf27170f GSL-d846fe50a3f0bb7767c7e087a05f4be95f4da0ec.tar.gz
537ce0a1731274da63a5be063311f7113c1391081e43970663a994b82a7b2e860302406c2931184789661d86343b2c60064c7014b73dc42799573f5b93bc12ff variant-550ac2f159ca883d360c196149b466955c77a573.tar.gz
@@ -162,15 +162,15 @@ cb01655dd097b68e89b15e6e4b1f6da10c52e8bec681eeef9807ca376283b10cb3da34acc976c790
3647ad5fff6326ba9c75fa98189a08c0909af8d1c2b704c8c62fd9da6603f5162af3176c37daa67eb5896bebe3814bf1fd66b9e93c78cbd9b439e472d0db4b44 ppc64le-enable-arch.patch
ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653 system-wide-fonts.patch
8b75da50a8212cd7c77e497ad5a49290e2656a2e01037d179cd6270105337a9adb238814f98bdf7a3e954ce8661dc3183a7400533067f9a21e38133a6628563a FindBreakpad.cmake
-2ce9f5c1d07a8d379754a79d173880c4ee75fbe1ed1e3df31053f3b588ddb1774312217869bbcf34a67f3c9de20abb963493110189cebedaf5bd0f10cc0dd48e Telegram.cmake
+53a95dfeabb3a923104132c657f228ed5ae689db86a541be3604c00eeecd3e18c20615111f3682d1355713d7005107a2f938a157bb0eb29948d11a709f2ea71e Telegram.cmake
56aaf0e35ba1989d463ffa2699e7c0a7235168599f0720f66ff159f03541920e04e5944554b4d1b3a0893cf4581ff50ff00600b54522d24d59fa7192e4f80c0a TelegramCodegen.cmake
f6e42004d36c69497fd635f1bbd9779027fef1b44fc506cba85ff19c5e49e6b41008782ffb65d59ef4acef78dc0a671c285789ae21cb7a67a9b215c28a2c2eeb TelegramCodegenTools.cmake
4726ba77330d61f952c7e5af82454cc5536cd92634150406ea5dbc303acfd1d33093334b9b04cf06aa4adca84d97553f28b44dcc554d10af8052352f265c9505 TelegramTests.cmake
fe1a860184fc31888430d8efb5d12bcf57ef0ed7d64a9570159b906138e987e711e52ea87e3e0567bf749f0336d394aba8a7af9bae6b156c621a13f0aa301b6e ThirdParty-crl.cmake
2282dedd3d6551893674272ea1308d0c36469711ecf52d1ac2cdc719ab0560a35abc968cc903678dd4e3c2454324e18bcb897b46c597a02013c6d75a7406fffe ThirdParty-libtgvoip-webrtc.cmake
72b7e188c6787b05f68031f24d901194315243a8b8fb5c3e0c10f1e7c75554ae147810e4d47fa2a0fdf7323da07f48b1cd4a6b840cffd65af96ad9a997e4caff ThirdParty-libtgvoip.cmake
-237700c1903661c7949585a0181154c5916b5fb3cf64a37bf61dc30151aaa99fc3952aaf950efec3b9879ae61147f3c586c252cb33a17017da7a3712827f3d14 ThirdParty-qtlottie.cmake
-41eb47dc7733e7e865a877579dcc742b0156fe6f4ad4f97dbc885814b3cc6d115e608fa9a268f21ab7de41835cb5aa0bedda29c0b2d3f9f901edfb08ee66e220 PrecompiledHeader-cmake.patch
+c80e0c9f79e61b7b152e17ec69be087f1312ffadf38ea5d5eecf4f43a2eadc0cba9112e61f878d2d8eb0c44c6c33bb8338c87009c6f2d97c58357d73de1af080 ThirdParty-qtlottie.cmake
+7ddeb1040e7bf707c13686861d289b3971381bed5c66a2d91b24d0d31c94c38634c0a08916219c51629cabdf33a386e4ad57f719054b0cc3ef1a85ea5d522994 PrecompiledHeader-cmake.patch
d7f8db23af250156b73b47ad4b1996b73643eb224c969cd1da2929eedfa23a3784ccf8a5728070f464891c621ec6f786e5da323f5bbb2a2cfba999cf80d9dec4 add-private-qt-functions.patch
6289d5a3eb224ebb05ab64e23ca3d081e617d905cec07edbba423265dc617548005eeb643ce5dfb2fcef9ac774e9f7b64150729bd894ca0e94af0e2aea9c823b fix-missing-use-of-pch.patch
ad7f1b811b7907b24e0708c5b8f7531891e163b3edebebb159e47cbc24a9201a6ddb5f276f4d0968f84c6d928997f1e94fe9ca678b31e9aad90cdf28449ce39f dynamic-linking-qt5.patch
diff --git a/testing/telegram-desktop/PrecompiledHeader-cmake.patch b/testing/telegram-desktop/PrecompiledHeader-cmake.patch
index e576b372d2..95f8cc372d 100644
--- a/testing/telegram-desktop/PrecompiledHeader-cmake.patch
+++ b/testing/telegram-desktop/PrecompiledHeader-cmake.patch
@@ -1,6 +1,6 @@
---- a/Telegram/gyp/PrecompiledHeader.cmake
-+++ b/Telegram/gyp/PrecompiledHeader.cmake
-@@ -112,7 +111,7 @@ function(add_precompiled_header _target _input)
+--- a/Telegram/gyp/PrecompiledHeader.cmake 2019-06-06 18:14:46.443138055 +0200
++++ b/Telegram/gyp/PrecompiledHeader.cmake 2019-06-06 18:15:45.874739539 +0200
+@@ -114,7 +114,7 @@
set(_compiler_FLAGS "@${_pch_c_flags_file}")
add_custom_command(
OUTPUT "${_output_c}"
@@ -9,7 +9,7 @@
DEPENDS "${_pchfile}" "${_pch_c_flags_file}"
IMPLICIT_DEPENDS C "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C)")
-@@ -123,7 +122,7 @@ function(add_precompiled_header _target _input)
+@@ -125,7 +125,7 @@
set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
add_custom_command(
OUTPUT "${_output_cxx}"
@@ -17,5 +17,5 @@
+ COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
IMPLICIT_DEPENDS CXX "${_pch_header}"
- COMMENT "Precompiling ${_name} for ${_target} (C++)")
+ COMMENT "Precompiling header ${_name} for ${_target} (C++)")
diff --git a/testing/telegram-desktop/Telegram.cmake b/testing/telegram-desktop/Telegram.cmake
index 6b0ba8c578..231c39c596 100644
--- a/testing/telegram-desktop/Telegram.cmake
+++ b/testing/telegram-desktop/Telegram.cmake
@@ -27,6 +27,7 @@ find_package(OpenSSL REQUIRED)
find_package(Threads REQUIRED)
find_package(X11 REQUIRED)
find_package(ZLIB REQUIRED)
+find_package(RapidJSON REQUIRED)
find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui Widgets Network)
get_target_property(QTCORE_INCLUDE_DIRS Qt5::Core INTERFACE_INCLUDE_DIRECTORIES)
@@ -53,8 +54,6 @@ list(APPEND THIRD_PARTY_INCLUDE_DIRS
${THIRD_PARTY_DIR}/emoji_suggestions
${THIRD_PARTY_DIR}/libtgvoip
${THIRD_PARTY_DIR}/variant/include
- ${THIRD_PARTY_DIR}/qtlottie/src/imports
- ${THIRD_PARTY_DIR}/qtlottie/src/bodymovin
)
add_subdirectory(${THIRD_PARTY_DIR}/crl)
@@ -96,6 +95,7 @@ file(GLOB FLAT_SOURCE_FILES
SourceFiles/inline_bots/*.cpp
SourceFiles/intro/*.cpp
SourceFiles/lang/*.cpp
+ SourceFiles/main/*.cpp
SourceFiles/mtproto/*.cpp
SourceFiles/overview/*.cpp
SourceFiles/passport/*.cpp
@@ -105,7 +105,6 @@ file(GLOB FLAT_SOURCE_FILES
SourceFiles/storage/*.cpp
SourceFiles/storage/cache/*.cpp
SourceFiles/support/*cpp
- SourceFiles/lottie/*cpp
${THIRD_PARTY_DIR}/emoji_suggestions/*.cpp
)
file(GLOB FLAT_EXTRA_FILES
@@ -157,6 +156,7 @@ set(TELEGRAM_INCLUDE_DIRS
${MINIZIP_INCLUDE_DIRS}
${OPENAL_INCLUDE_DIR}
${QT_PRIVATE_INCLUDE_DIRS}
+ ${RAPIDJSON_INCLUDE_DIRS}
${THIRD_PARTY_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
@@ -164,8 +164,8 @@ set(TELEGRAM_INCLUDE_DIRS
set(TELEGRAM_LINK_LIBRARIES
xxhash
crl
- tgvoip
qtlottie
+ tgvoip
OpenSSL::Crypto
OpenSSL::SSL
Qt5::DBus
diff --git a/testing/telegram-desktop/ThirdParty-qtlottie.cmake b/testing/telegram-desktop/ThirdParty-qtlottie.cmake
index 97926608a6..b3ccb032b3 100644
--- a/testing/telegram-desktop/ThirdParty-qtlottie.cmake
+++ b/testing/telegram-desktop/ThirdParty-qtlottie.cmake
@@ -1,6 +1,14 @@
project(qtlottie)
-find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui)
+set(CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+list(APPEND CMAKE_MODULE_PATH
+ ${CMAKE_SOURCE_DIR}/gyp
+)
+
+find_package(Qt5 REQUIRED COMPONENTS Core Gui)
foreach(__qt_module IN ITEMS QtCore QtGui)
list(APPEND QT_PRIVATE_INCLUDE_DIRS
@@ -8,14 +16,28 @@ foreach(__qt_module IN ITEMS QtCore QtGui)
${QT_INCLUDE_DIR}/${__qt_module}/${Qt5_VERSION}/${__qt_module}
)
endforeach()
-message(STATUS "Using Qt private include directories: ${QT_PRIVATE_INCLUDE_DIRS}")
file(GLOB QTLOTTIE_SOURCE_FILES
src/bodymovin/*.cpp
- src/imports/rasterrenderer/*.cpp
+ src/imports/rasterrenderer/rasterrenderer.cpp
+ ../../SourceFiles/lottie/*.cpp
)
add_library(${PROJECT_NAME} STATIC ${QTLOTTIE_SOURCE_FILES})
-target_include_directories(${PROJECT_NAME} PUBLIC src src/bodymovin ${QT_PRIVATE_INCLUDE_DIRS})
-target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Widgets Qt5::Gui)
+include(PrecompiledHeader)
+add_precompiled_header(${PROJECT_NAME} ../../SourceFiles/lottie/lottie_pch.h)
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+ src
+ src/bodymovin
+ src/imports
+ ${CMAKE_SOURCE_DIR}/SourceFiles
+ ${CMAKE_SOURCE_DIR}/ThirdParty/GSL/include
+ ${CMAKE_SOURCE_DIR}/ThirdParty/variant/include
+ ${QT_PRIVATE_INCLUDE_DIRS}
+)
+set_target_properties(${PROJECT_NAME} PROPERTIES AUTOMOC_MOC_OPTIONS -bqtlottie_pch/lottie_pch.h)
+target_compile_definitions(${PROJECT_NAME} PUBLIC BODYMOVIN_LIBRARY)
+target_link_libraries(${PROJECT_NAME} crl Qt5::Core Qt5::Widgets)
+