jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

telegram-desktop: update to 1.9.4.

Browse source
This commit is contained in:
John Zimmermann 2020-01-17 19:42:04 +01:00
parent ebc6dbf310
commit 2409b236b1
7 changed files with 4 additions and 593 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

342
srcpkgs/telegram-desktop/patches/0001-Dyn-linking.patch
View file

@ -1,342 +0,0 @@
From c924d0a2b962536eb245d5c67af6f8c3a1eb54b3 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sun, 29 Dec 2019 20:05:02 +0100
Subject: [PATCH] Dyn linking
---
external/crash_reports/CMakeLists.txt | 2 ++
external/ffmpeg/CMakeLists.txt | 13 +++++++++++
external/openal/CMakeLists.txt | 16 ++++++++++++++
external/openssl/CMakeLists.txt | 16 +++++++++++++-
external/opus/CMakeLists.txt | 13 +++++++++++
external/qt/CMakeLists.txt | 31 +++++++++++++++++++++++++++
external/qt/package.cmake | 4 ++++
external/ranges/CMakeLists.txt | 4 ++--
external/zlib/CMakeLists.txt | 13 +++++++++++
init_target.cmake | 2 +-
options_linux.cmake | 6 +++---
variables.cmake | 4 ++--
12 files changed, 115 insertions(+), 9 deletions(-)
diff --git cmake/external/crash_reports/CMakeLists.txt cmake/external/crash_reports/CMakeLists.txt
index a741bcb..11e94e8 100644
--- cmake/external/crash_reports/CMakeLists.txt
+++ cmake/external/crash_reports/CMakeLists.txt
@@ -7,6 +7,7 @@
add_library(external_crash_reports INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_crash_reports ALIAS external_crash_reports)
+if(NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
if (WIN32 OR LINUX OR build_macstore)
add_subdirectory(breakpad)
target_link_libraries(external_crash_reports
@@ -20,3 +21,4 @@ else()
desktop-app::external_crashpad
)
endif()
+endif()
diff --git cmake/external/ffmpeg/CMakeLists.txt cmake/external/ffmpeg/CMakeLists.txt
index 014fb06..888066a 100644
--- cmake/external/ffmpeg/CMakeLists.txt
+++ cmake/external/ffmpeg/CMakeLists.txt
@@ -7,6 +7,18 @@
add_library(external_ffmpeg INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_ffmpeg ALIAS external_ffmpeg)
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libavutil libswresample libswscale)
+ target_link_libraries(external_ffmpeg
+ INTERFACE
+ ${FFMPEG_LIBRARIES}
+ )
+ target_include_directories(external_ffmpeg SYSTEM
+ INTERFACE
+ ${FFMPEG_INCLUDE_DIRS}
+ )
+else()
target_include_directories(external_ffmpeg SYSTEM
INTERFACE
${libs_loc}/ffmpeg
@@ -36,3 +48,4 @@ if (LINUX)
Xrender
)
endif()
+endif()
diff --git cmake/external/openal/CMakeLists.txt cmake/external/openal/CMakeLists.txt
index e2e4992..ea32ed1 100644
--- cmake/external/openal/CMakeLists.txt
+++ cmake/external/openal/CMakeLists.txt
@@ -7,6 +7,21 @@
add_library(external_openal INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_openal ALIAS external_openal)
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ find_package(OpenAL REQUIRED)
+ target_include_directories(external_openal SYSTEM
+ INTERFACE
+ ${OPENAL_INCLUDE_DIR}
+ )
+ target_link_libraries(external_openal
+ INTERFACE
+ ${OPENAL_LIBRARY}
+ )
+ target_compile_definitions(external_openal
+ INTERFACE
+ AL_ALEXT_PROTOTYPES
+ )
+else()
if (WIN32)
target_include_directories(external_openal SYSTEM
INTERFACE
@@ -41,3 +56,4 @@ INTERFACE
AL_LIBTYPE_STATIC
AL_ALEXT_PROTOTYPES
)
+endif()
diff --git cmake/external/openssl/CMakeLists.txt cmake/external/openssl/CMakeLists.txt
index bcbcbfa..a834a0e 100644
--- cmake/external/openssl/CMakeLists.txt
+++ cmake/external/openssl/CMakeLists.txt
@@ -7,7 +7,13 @@
add_library(external_openssl INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_openssl ALIAS external_openssl)
-if (LINUX)
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ find_package(OpenSSL REQUIRED)
+ target_include_directories(external_openssl SYSTEM
+ INTERFACE
+ ${OPENSSL_INCLUDE_DIR}
+ )
+elseif (LINUX)
target_include_directories(external_openssl SYSTEM
INTERFACE
/usr/local/desktop-app/openssl-1.1.1/include
@@ -24,6 +30,13 @@ else()
)
endif()
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ target_link_libraries(external_openssl
+ INTERFACE
+ OpenSSL::Crypto
+ OpenSSL::SSL
+ )
+else()
if (WIN32)
set(openssl_lib_ext lib)
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out32$<$<CONFIG:Debug>:.dbg>)
@@ -45,6 +58,7 @@ INTERFACE
${openssl_lib_loc}/libssl.${openssl_lib_ext}
${openssl_lib_loc}/libcrypto.${openssl_lib_ext}
)
+endif()
if (LINUX)
if (DESKTOP_APP_USE_GLIBC_WRAPS)
diff --git cmake/external/opus/CMakeLists.txt cmake/external/opus/CMakeLists.txt
index 00c2508..960b7fa 100644
--- cmake/external/opus/CMakeLists.txt
+++ cmake/external/opus/CMakeLists.txt
@@ -7,6 +7,18 @@
add_library(external_opus INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_opus ALIAS external_opus)
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(OPUS REQUIRED opus)
+ target_include_directories(external_opus SYSTEM
+ INTERFACE
+ ${OPUS_INCLUDE_DIRS}
+ )
+ target_link_libraries(external_opus
+ INTERFACE
+ ${OPUS_LIBRARIES}
+ )
+else()
target_include_directories(external_opus SYSTEM
INTERFACE
${libs_loc}/opus/include
@@ -43,3 +55,4 @@ else()
opus
)
endif()
+endif()
diff --git cmake/external/qt/CMakeLists.txt cmake/external/qt/CMakeLists.txt
index 1a56319..1744a8b 100644
--- cmake/external/qt/CMakeLists.txt
+++ cmake/external/qt/CMakeLists.txt
@@ -15,6 +15,36 @@ if (LINUX)
endif()
endif()
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ get_target_property(QTCORE_INCLUDE_DIRS Qt5::Core INTERFACE_INCLUDE_DIRECTORIES)
+ list(GET QTCORE_INCLUDE_DIRS 0 QT_INCLUDE_DIR)
+
+ foreach(__qt_module IN ITEMS QtCore QtGui)
+ list(APPEND QT_PRIVATE_INCLUDE_DIRS
+ ${QT_INCLUDE_DIR}/${__qt_module}/${Qt5_VERSION}
+ ${QT_INCLUDE_DIR}/${__qt_module}/${Qt5_VERSION}/${__qt_module}
+ )
+ endforeach()
+ message(STATUS "Using Qt private include directories: ${QT_PRIVATE_INCLUDE_DIRS}")
+ target_include_directories(external_qt SYSTEM
+ INTERFACE
+ ${QT_PRIVATE_INCLUDE_DIRS}
+ )
+ target_link_libraries(external_qt
+ INTERFACE
+ Qt5::DBus
+ Qt5::Network
+ Qt5::Widgets
+ desktop-app::external_zlib
+ xcb
+ X11
+ X11-xcb
+ dbus-1
+ dl
+ glib-2.0
+ pthread
+ )
+else()
target_include_directories(external_qt SYSTEM
INTERFACE
${qt_loc}/include
@@ -215,3 +245,4 @@ if (LINUX)
pthread
)
endif()
+endif()
diff --git cmake/external/qt/package.cmake cmake/external/qt/package.cmake
index 36a1dfd..320edc4 100644
--- cmake/external/qt/package.cmake
+++ cmake/external/qt/package.cmake
@@ -4,6 +4,9 @@
# For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+
+else()
if (NOT APPLE OR NOT build_osx)
set(qt_version 5.12.5)
else()
@@ -17,6 +20,7 @@ else()
endif()
set(Qt5_DIR ${qt_loc}/lib/cmake/Qt5)
+endif()
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
diff --git cmake/external/ranges/CMakeLists.txt cmake/external/ranges/CMakeLists.txt
index 4c75ecb..51f972a 100644
--- cmake/external/ranges/CMakeLists.txt
+++ cmake/external/ranges/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(desktop-app::external_ranges ALIAS external_ranges)
target_include_directories(external_ranges SYSTEM
INTERFACE
- ${libs_loc}/range-v3/include
+ /usr/include
)
if (WIN32)
@@ -18,4 +18,4 @@ if (WIN32)
/experimental:preprocessor # need for range-v3 see https://github.com/ericniebler/range-v3#supported-compilers
/wd5105 # needed for `/experimental:preprocessor`, suppressing C5105 "macro expansion producing 'defined' has undefined behavior"
)
-endif()
\ No newline at end of file
+endif()
diff --git cmake/external/zlib/CMakeLists.txt cmake/external/zlib/CMakeLists.txt
index d2bc1fc..1c65298 100644
--- cmake/external/zlib/CMakeLists.txt
+++ cmake/external/zlib/CMakeLists.txt
@@ -7,6 +7,18 @@
add_library(external_zlib INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_zlib ALIAS external_zlib)
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ find_package(ZLIB REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(MINIZIP REQUIRED minizip)
+ find_library(minizip_LIBRARY minizip)
+ target_link_libraries(external_zlib INTERFACE ZLIB::ZLIB ${minizip_LIBRARY})
+ target_include_directories(external_zlib SYSTEM
+ INTERFACE
+ ${ZLIB_INCLUDE_DIR}
+ ${MINIZIP_INCLUDE_DIRS}
+ )
+else()
if (NOT WIN32)
add_library(external_minizip STATIC)
init_target(external_minizip "(external)")
@@ -49,3 +61,4 @@ elseif (APPLE)
else()
target_link_static_libraries(external_zlib INTERFACE z)
endif()
+endif()
diff --git cmake/init_target.cmake cmake/init_target.cmake
index c7a1244..2824a60 100644
--- cmake/init_target.cmake
+++ cmake/init_target.cmake
@@ -27,7 +27,7 @@ function(init_target target_name) # init_target(my_target folder_name)
endif()
target_link_libraries(${target_name} PUBLIC desktop-app::common_options)
set_target_properties(${target_name} PROPERTIES
- LINK_SEARCH_START_STATIC 1
+ LINK_SEARCH_START_STATIC 0
XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES
XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN YES
XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN YES
diff --git cmake/options_linux.cmake cmake/options_linux.cmake
index a6a13c9..53cfb63 100644
--- cmake/options_linux.cmake
+++ cmake/options_linux.cmake
@@ -25,6 +25,9 @@ INTERFACE
-Wno-stringop-overflow
-Wno-maybe-uninitialized
-Wno-error=class-memaccess
+ -Wno-error=deprecated-copy
+ -Wno-error=deprecated-declarations
+ -Wno-error=redundant-move
)
target_link_options(common_options
INTERFACE
@@ -33,8 +36,5 @@ INTERFACE
if (build_linux32)
target_compile_options(common_options INTERFACE -g0)
target_link_options(common_options INTERFACE -g0)
-else()
- target_compile_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto>)
- target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
endif()
diff --git cmake/variables.cmake cmake/variables.cmake
index b3d7ff4..4422b97 100644
--- cmake/variables.cmake
+++ cmake/variables.cmake
@@ -10,6 +10,7 @@ option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF)
option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON)
option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF)
option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ON)
+option(DESKTOP_APP_USE_SYSTEM_LIBS "Use system libs where possible." OFF)
function(report_bad_special_target)
message(FATAL_ERROR "Bad special target '${DESKTOP_APP_SPECIAL_TARGET}'")
@@ -59,8 +60,7 @@ elseif (APPLE)
set(DESKTOP_APP_USE_GLIBC_WRAPS OFF)
else()
set(LINUX 1)
- execute_process(COMMAND uname -m OUTPUT_VARIABLE machine_uname)
- if (NOT ${machine_uname} MATCHES "x86_64" AND NOT ${machine_uname} MATCHES "aarch64")
+ if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(build_linux32 1)
endif()
if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux")
--
2.24.1

167
srcpkgs/telegram-desktop/patches/0001-Dynamic-linking.patch
View file

@ -1,167 +0,0 @@
From 85ae791a9ebf5a2603f12d2a6e2d75549a01d701 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Thu, 2 Jan 2020 12:38:39 +0100
Subject: [PATCH] Dynamic linking
---
Telegram/CMakeLists.txt | 7 +-
Telegram/SourceFiles/core/launcher.cpp | 8 +++
Telegram/SourceFiles/qt_functions.cpp | 96 ++++++++++++++++++++++++++
3 files changed, 107 insertions(+), 4 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
diff --git Telegram/CMakeLists.txt Telegram/CMakeLists.txt
index 8e6f8648d..cf5da1c13 100644
--- Telegram/CMakeLists.txt
+++ Telegram/CMakeLists.txt
@@ -934,9 +934,9 @@ PRIVATE
mainwidget.h
mainwindow.cpp
mainwindow.h
+ qt_functions.cpp
observer_peer.cpp
observer_peer.h
- qt_static_plugins.cpp
settings.cpp
settings.h
)
@@ -1104,13 +1104,12 @@ target_compile_definitions(Telegram
PRIVATE
TDESKTOP_API_ID=${TDESKTOP_API_ID}
TDESKTOP_API_HASH=${TDESKTOP_API_HASH}
- AL_LIBTYPE_STATIC
AL_ALEXT_PROTOTYPES
)
-if (${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode|Ninja)")
+if ((${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode)") OR ((${CMAKE_GENERATOR} MATCHES "(Ninja)") AND (NOT ${DESKTOP_APP_SPECIAL_TARGET} STREQUAL "")))
set(output_folder ${CMAKE_BINARY_DIR})
-elseif((${CMAKE_GENERATOR} MATCHES "(Unix Makefiles)") AND DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
+elseif((${CMAKE_GENERATOR} MATCHES "(Unix Makefiles|Ninja)") AND DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
set(output_folder ${CMAKE_BINARY_DIR}/bin)
else()
set(output_folder ${CMAKE_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>)
diff --git Telegram/SourceFiles/core/launcher.cpp Telegram/SourceFiles/core/launcher.cpp
index 25473426f..d0319e86f 100644
--- Telegram/SourceFiles/core/launcher.cpp
+++ Telegram/SourceFiles/core/launcher.cpp
@@ -278,6 +278,14 @@ int Launcher::exec() {
Platform::start();
Ui::DisableCustomScaling();
+
+ // I don't know why path is not in QT_PLUGIN_PATH by default
+ QCoreApplication::addLibraryPath("/usr/lib/qt5/plugins");
+ // without this Telegram doesn't start on Ubuntu 17.04 due GTK errors
+ setenv("QT_STYLE_OVERRIDE", "qwerty", false);
+ // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943
+ unsetenv("QT_QPA_PLATFORMTHEME");
+
auto result = executeApplication();
DEBUG_LOG(("Telegram finished, result: %1").arg(result));
diff --git Telegram/SourceFiles/qt_functions.cpp Telegram/SourceFiles/qt_functions.cpp
new file mode 100644
index 000000000..a12cc53f0
--- /dev/null
+++ Telegram/SourceFiles/qt_functions.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file contains some parts of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <private/qfontengine_p.h>
+
+/* TODO: find a dynamic library with these symbols. */
+
+/* Debian maintainer: this function is taken from qfiledialog.cpp */
+/*
+ Makes a list of filters from ;;-separated text.
+ Used by the mac and windows implementations
+*/
+QStringList qt_make_filter_list(const QString &filter)
+{
+ QString f(filter);
+
+ if (f.isEmpty())
+ return QStringList();
+
+ QString sep(QLatin1String(";;"));
+ int i = f.indexOf(sep, 0);
+ if (i == -1) {
+ if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
+ sep = QLatin1Char('\n');
+ i = f.indexOf(sep, 0);
+ }
+ }
+
+ return f.split(sep);
+}
+
+/* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */
+QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format)
+ : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format),
+ num_chars(numChars), chars(chars_), logClusters(0), f(font), glyphs(g), fontEngine(fe)
+{
+}
+
+/* Debian maintainer: this method is also taken from qtextengine.cpp */
+// Fix up flags and underlineStyle with given info
+void QTextItemInt::initWithScriptItem(const QScriptItem &si)
+{
+ // explicitly initialize flags so that initFontAttributes can be called
+ // multiple times on the same TextItem
+ flags = 0;
+ if (si.analysis.bidiLevel %2)
+ flags |= QTextItem::RightToLeft;
+ ascent = si.ascent;
+ descent = si.descent;
+
+ if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
+ underlineStyle = charFormat.underlineStyle();
+ } else if (charFormat.boolProperty(QTextFormat::FontUnderline)
+ || f->d->underline) {
+ underlineStyle = QTextCharFormat::SingleUnderline;
+ }
+
+ // compat
+ if (underlineStyle == QTextCharFormat::SingleUnderline)
+ flags |= QTextItem::Underline;
+
+ if (f->d->overline || charFormat.fontOverline())
+ flags |= QTextItem::Overline;
+ if (f->d->strikeOut || charFormat.fontStrikeOut())
+ flags |= QTextItem::StrikeOut;
+}
--
2.24.1

27
srcpkgs/telegram-desktop/patches/0004-gtk3.patch
View file

@ -1,27 +0,0 @@
From ef30081973681f4f8d261917fa763b00adfbe6e9 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Thu, 2 Jan 2020 13:10:31 +0100
Subject: [PATCH] gtk3
---
Telegram/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git Telegram/CMakeLists.txt Telegram/CMakeLists.txt
index cf5da1c13..0d155d54a 100644
--- Telegram/CMakeLists.txt
+++ Telegram/CMakeLists.txt
@@ -1018,8 +1018,8 @@ elseif (LINUX)
if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
find_package(PkgConfig REQUIRED)
- pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
- target_include_directories(Telegram PRIVATE ${GTK2_INCLUDE_DIRS})
+ pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+ target_include_directories(Telegram PRIVATE ${GTK3_INCLUDE_DIRS})
target_compile_options(Telegram PRIVATE -Wno-register)
set(appindicator_packages
--
2.24.1

10
srcpkgs/telegram-desktop/patches/0005-Werror.patch
View file

@ -1,10 +0,0 @@
--- cmake/options_linux.cmake 2020-01-02 13:29:15.748669711 +0100
+++ - 2020-01-02 13:36:08.581505523 +0100
@@ -9,7 +9,6 @@
$<IF:$<CONFIG:Debug>,,-Ofast -fno-strict-aliasing>
-pipe
-Wall
- -Werror
-W
-fPIC
-Wno-unused-variable

18
srcpkgs/telegram-desktop/patches/0006-move-project-init-cmake.patch
View file

@ -1,18 +0,0 @@
--- CMakeLists.txt 2019-12-31 16:06:54.000000000 +0100
+++ - 2020-01-02 19:50:26.729834118 +0100
@@ -10,7 +10,6 @@
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-include(cmake/variables.cmake)
include(cmake/version.cmake)
desktop_app_parse_version(Telegram/build/version)
@@ -22,6 +21,7 @@
)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
+include(cmake/variables.cmake)
include(cmake/nice_target_sources.cmake)
include(cmake/target_link_static_libraries.cmake)
include(cmake/target_link_frameworks.cmake)

25
srcpkgs/telegram-desktop/patches/6945.patch
View file

@ -1,25 +0,0 @@
From 47a484ba63811f6d4642e702a5c27b77001165e1 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Thu, 2 Jan 2020 16:05:29 +0100
Subject: [PATCH] lib_tgvoip.cmake: Match against x86 arches.
This avoids matching against other 32bit arches like armv7/armhf that
doesn't have msse2 but are 32bit and need other 32bit-specific flags to
allow for compilation like -g0.
---
Telegram/cmake/lib_tgvoip.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake
index 38fa632a40..2801fbec2d 100644
--- Telegram/cmake/lib_tgvoip.cmake
+++ Telegram/cmake/lib_tgvoip.cmake
@@ -756,7 +756,7 @@ else()
-Wno-error=sequence-point
-Wno-error=unused-result
)
- if (build_linux32)
+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(i686|i386|x86)")
target_compile_options(lib_tgvoip PRIVATE -msse2)
endif()
target_compile_definitions(lib_tgvoip

8
srcpkgs/telegram-desktop/template
View file

@ -1,12 +1,12 @@
# Template file for 'telegram-desktop' # Template file for 'telegram-desktop'
pkgname=telegram-desktop pkgname=telegram-desktop
version=1.9.3 version=1.9.4
revision=2 revision=1
wrksrc="tdesktop-${version}-full" wrksrc="tdesktop-${version}-full"
build_style=cmake build_style=cmake
build_helper="qemu" build_helper="qemu"
configure_args="-DTDESKTOP_API_ID=209235 -DTDESKTOP_API_HASH=169ee702e1df4b6e66d80311db36cc43 configure_args="-DTDESKTOP_API_ID=209235 -DTDESKTOP_API_HASH=169ee702e1df4b6e66d80311db36cc43
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF -DDESKTOP_APP_USE_SYSTEM_LIBS=ON -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" -DDESKTOP_APP_USE_GLIBC_WRAPS=ON -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python" hostmakedepends="pkg-config qt5-qmake qt5-host-tools python"
makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel
libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel
@ -19,7 +19,7 @@ license="GPL-3.0-or-later WITH OpenSSL"
homepage="https://desktop.telegram.org/" homepage="https://desktop.telegram.org/"
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" 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" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
checksum=ca9c67369140952d5ffe404ca082517193e3832b2c21ba1af791f078e4d9a7bb checksum=9ef7ac0e97629dec7ff68aea54f517a40c4a41fa9197f205bd4431d0e37abad1
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in