Hello community,
here is the log from the commit of package telegram-desktop for
openSUSE:Factory checked in at 2020-01-18 12:17:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telegram-desktop (Old)
and /work/SRC/openSUSE:Factory/.telegram-desktop.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telegram-desktop"
Sat Jan 18 12:17:40 2020 rev:25 rq:764924 version:1.9.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/telegram-desktop/telegram-desktop.changes
2019-11-26 16:52:41.572242179 +0100
+++
/work/SRC/openSUSE:Factory/.telegram-desktop.new.26092/telegram-desktop.changes
2020-01-18 12:18:22.815146925 +0100
@@ -1,0 +2,20 @@
+Thu Jan 16 01:47:32 UTC 2020 - Xu Zhao <[email protected]>
+
+- Upgrade to 1.9.3
+ * Videos in chats start playing automatically.
+ * Resume playback from where you left off when watching long
+ videos and listening to long audio tracks.
+ * Control automatic playback for videos, GIFs and round video
+ messages in Settings > Advanced > Automatic media download.
+ * Enjoy system spell checker support on all modern systems.
+- Switch build system to Ninja
+- Rename default-gtk2.patch to 0000-gtk2-default.patch,
+ removed tdesktop.patch
+- Added patches:
+ * 0001-Dynamic-linking-system-libs.patch
+ * 0002-Dynamic-linking-system-qt.patch
+ * 0004-gtk3.patch
+ * 0005-Use-system-wide-fonts.patch
+ * 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
+
+-------------------------------------------------------------------
Old:
----
Catch2-master.zip
GSL-master.zip
breakpad-master.tar.gz
crl-master.zip
default-gtk2.patch
gyp-master.tar.gz
libtgvoip.zip
linux-syscall-support-refs-heads-master.tar.gz
lz4-dev.zip
patch.py
qt_functions.cpp
rlottie-master.zip
tdesktop.patch
v1.8.15.tar.gz
variant-master.zip
xxHash-master.zip
New:
----
0000-gtk2-default.patch
0001-Dynamic-linking-system-libs.patch
0002-Dynamic-linking-system-qt.patch
0004-gtk3.patch
0005-Use-system-wide-fonts.patch
0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
tdesktop-1.9.3-full.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telegram-desktop.spec ++++++
--- /var/tmp/diff_new_pack.8z9nrB/_old 2020-01-18 12:18:25.111148156 +0100
+++ /var/tmp/diff_new_pack.8z9nrB/_new 2020-01-18 12:18:25.119148160 +0100
@@ -1,7 +1,7 @@
#
# spec file for package telegram-desktop
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,42 +29,21 @@
%endif
Name: telegram-desktop
-Version: 1.8.15
+Version: 1.9.3
Release: 0
Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only
Group: Productivity/Networking/Instant Messenger
URL: https://github.com/telegramdesktop/tdesktop
-Source0:
https://github.com/telegramdesktop/tdesktop/archive/v%{version}.tar.gz
-# curl
https://chromium.googlesource.com/breakpad/breakpad/+archive/refs/heads/master.tar.gz
-o breakpad-master.tar.gz
-Source1: breakpad-master.tar.gz
-# curl
https://chromium.googlesource.com/linux-syscall-support/+archive/master.tar.gz
-o linux-syscall-support-refs-heads-master.tar.gz
-Source2: linux-syscall-support-refs-heads-master.tar.gz
-# curl https://chromium.googlesource.com/external/gyp/+archive/master.tar.gz
-o gyp-master.tar.gz
-Source3: gyp-master.tar.gz
-Source4: patch.py
-# curl https://codeload.github.com/Microsoft/GSL/zip/master -o GSL-master.zip
-Source5: GSL-master.zip
-# curl https://codeload.github.com/mapbox/variant/zip/master -o
variant-master.zip
-Source6: variant-master.zip
-# curl https://codeload.github.com/grishka/libtgvoip/zip/public -o
libtgvoip.zip
-Source7: libtgvoip.zip
-# curl https://codeload.github.com/catchorg/Catch2/master -o Catch2-master.zip
-Source8: Catch2-master.zip
+Source0:
https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz
# curl https://codeload.github.com/ericniebler/range-v3/zip/master -o
range-v3-master.zip
-Source9: range-v3-master.zip
-# curl https://codeload.github.com/telegramdesktop/crl/zip/master -o
crl-master.zip
-Source10: crl-master.zip
-# curl https://codeload.github.com/Cyan4973/xxHash/zip/master -o
xxHash-master.zip
-Source11: xxHash-master.zip
-# curl https://codeload.github.com/lz4/lz4/zip/dev -o lz4-dev.zip
-Source12: lz4-dev.zip
-# curl https://codeload.github.com/john-preston/rlottie/zip/master -o
rlottie-master.zip
-Source13: rlottie-master.zip
-Source14: qt_functions.cpp
-
-Patch0: tdesktop.patch
-Patch1: default-gtk2.patch
+Source1: range-v3-master.zip
+Patch0: 0000-gtk2-default.patch
+Patch1: 0001-Dynamic-linking-system-libs.patch
+Patch2: 0002-Dynamic-linking-system-qt.patch
+Patch3: 0004-gtk3.patch
+Patch4: 0005-Use-system-wide-fonts.patch
+Patch5: 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
BuildRequires: chrpath
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -75,18 +54,19 @@
%else
BuildRequires: gcc-c++
%endif
+BuildRequires: enchant-devel
BuildRequires: glibc-devel
BuildRequires: libQt5Core-private-headers-devel
BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: libjpeg-devel
+BuildRequires: liblz4-devel
BuildRequires: libqt5-qtbase-common-devel
BuildRequires: libqt5-qtimageformats-devel
+BuildRequires: ninja
BuildRequires: pkgconfig
-# python2-base is required for gyp, Auto pulled in for Tumbleweed, but need
for Leap 15.
-BuildRequires: python2-base
-BuildRequires: python3
BuildRequires: unzip
BuildRequires: xorg-x11-devel
+BuildRequires: xxhash-devel
BuildRequires: xz
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
@@ -158,58 +138,17 @@
The service also provides APIs to independent developers.
%prep
-%setup -q -n tdesktop-%{version}
-cp %{SOURCE8} Telegram/SourceFiles/base
-
-cp %{_sourcedir}/GSL-master.zip . && unzip GSL-master.zip
-mv GSL-master GSL
-mv GSL %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/variant-master.zip . && unzip variant-master.zip
-mv variant-master variant
-mv variant %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/libtgvoip.zip . && unzip libtgvoip.zip
-mv libtgvoip-public libtgvoip
-mv libtgvoip %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/range-v3-master.zip . && unzip range-v3-master.zip
-mv range-v3-master range-v3
-mkdir -p %{_builddir}/Libraries
-mv range-v3 %{_builddir}/Libraries/
-
-cp %{_sourcedir}/crl-master.zip . && unzip crl-master.zip
-mv crl-master crl
-mv crl %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/rlottie-master.zip . && unzip rlottie-master.zip
-mv rlottie-master rlottie
-mv rlottie %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/lz4-dev.zip . && unzip lz4-dev.zip
-mv lz4-dev lz4
-mv lz4 %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/xxHash-master.zip . && unzip xxHash-master.zip
-mv xxHash-master xxHash
-mv xxHash %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
-
-cp %{_sourcedir}/Catch2-master.zip . && unzip Catch2-master.zip
-mv Catch2-master Catch
-mv Catch %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
+%setup -q -n tdesktop-%{version}-full
-cp %{_sourcedir}/tdesktop.patch %{_builddir}/tdesktop-%{version}
-cd %{_builddir}/tdesktop-%{version}
+unzip %{_sourcedir}/range-v3-master.zip -d %{_builddir}/Libraries/
+mv %{_builddir}/Libraries/range-v3-master %{_builddir}/Libraries/range-v3
%patch0 -p1
%patch1 -p1
-cp %{_sourcedir}/patch.py . && python3 ./patch.py
-cp %{_sourcedir}/qt_functions.cpp Telegram/SourceFiles/
-sed -i '1i<(src_loc)/qt_functions.cpp' Telegram/gyp/telegram/sources.txt
-
-%setup -q -T -c -n breakpad -a 1
-%setup -q -T -c -n breakpad-lss -a 2
-%setup -q -T -c -n gyp -a 3
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%if %{with gcc8}
@@ -217,64 +156,43 @@
export CXX=/usr/bin/g++-8
%endif
-mv %{_builddir}/tdesktop-%{version} %{_builddir}/tdesktop
+cmake -B build -G Ninja . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DTDESKTOP_API_ID=340630 \
+ -DTDESKTOP_API_HASH=98a22f733eac40f1bd187a30d19271de \
+ -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
+ -DDESKTOP_APP_USE_SYSTEM_LIBS=ON \
+ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
+ -DTDESKTOP_DISABLE_AUTOUPDATE=ON \
+ -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
+ -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
+ -DDESKTOP_APP_SPECIAL_TARGET=""
-# patch gyp
-cd %{_builddir}/Libraries
-ln -s %{_builddir}/gyp
-cp %{_builddir}/tdesktop/Telegram/Patches/gyp.diff gyp
-cd gyp
-patch -p1 < gyp.diff
-
-# Build breakpad
-cd %{_builddir}/breakpad
-ln -s %{_builddir}/breakpad-lss src/third_party/lss
-%configure
-%make_build
-make %{?_smp_mflags} install DESTDIR=%{_builddir}/Libraries/breakpad
-
-cd %{_builddir}/tdesktop/Telegram/gyp
-# patch qt.gypi to change libxkbcommon path
-%{_builddir}/Libraries/gyp/gyp \
- -Dapi_id=340630 \
- -Dapi_hash=98a22f733eac40f1bd187a30d19271de \
- -Dlinux_lib_ssl=-lssl \
- -Dlinux_lib_crypto=-lcrypto \
- -Dlinux_lib_icu="-licuuc -licutu -licui18n" \
- -Dlinux_path_opus_include="%{_includedir}/opus" \
- -Dlinux_path_breakpad="%{_builddir}/Libraries/breakpad%{_prefix}" \
- -Gconfig=Release \
- --depth=. --generator-output="%{_builddir}/tdesktop" -Goutput_dir=out
Telegram.gyp --format=cmake
-
-# build Telegram
-cd %{_builddir}/tdesktop/out/Release
-%cmake ..
-sed -i 's,breakpad/usr/lib,breakpad%{_libdir},'
./CMakeFiles/Telegram.dir/link.txt
-%make_build
-chrpath --delete Telegram
+ninja -C build
%install
# Install binary
install -dm755 %{buildroot}%{_bindir}
-install -m755 %{_builddir}/tdesktop/out/Release/build/Telegram
%{buildroot}%{_bindir}/%{name}
+install -m755 build/bin/Telegram %{buildroot}%{_bindir}/%{name}
# Install desktop file
install -d %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
--add-category InstantMessaging \
- %{_builddir}/tdesktop/lib/xdg/telegramdesktop.desktop
+ lib/xdg/telegramdesktop.desktop
# Install protocol
install -d %{buildroot}%{_datadir}/kservices5
-install -m644 %{_builddir}/tdesktop/lib/xdg/tg.protocol \
+install -m644 lib/xdg/tg.protocol \
%{buildroot}%{_datadir}/kservices5/tg.protocol
# Install icons
for icon_size in 16 32 48 64 128 256 512; do
icon_dir="%{buildroot}%{_datadir}/icons/hicolor/${icon_size}x${icon_size}/apps"
install -d "${icon_dir}"
- install -m644
"%{_builddir}/tdesktop/Telegram/Resources/art/icon${icon_size}.png" \
+ install -m644 "Telegram/Resources/art/icon${icon_size}.png" \
"${icon_dir}/telegram.png"
done
++++++ 0000-gtk2-default.patch ++++++
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 5071d63..f8c0f20 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -237,15 +237,15 @@ void start() {
bool indicatorLoaded = false;
bool isWayland =
QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
QLibrary lib_gtk, lib_indicator;
- if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) ||
loadLibrary(lib_indicator, "appindicator3", 1)) {
- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) ||
loadLibrary(lib_indicator, "appindicator", 1)) {
+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
indicatorLoaded = setupAppIndicator(lib_indicator);
}
}
if ((!gtkLoaded || !indicatorLoaded) && !isWayland) {
- if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) ||
loadLibrary(lib_indicator, "appindicator", 1)) {
- if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+ if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) ||
loadLibrary(lib_indicator, "appindicator3", 1)) {
+ if (loadLibrary(lib_gtk, "gtk-3", 0)) {
gtkLoaded = indicatorLoaded = false;
gtkLoaded = setupGtkBase(lib_gtk);
indicatorLoaded =
setupAppIndicator(lib_indicator);
@@ -255,10 +255,10 @@ void start() {
// If no appindicator, try at least load gtk.
if (!gtkLoaded && !indicatorLoaded) {
- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
gtkLoaded = setupGtkBase(lib_gtk);
}
- if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk,
"gtk-x11-2.0", 0)) {
+ if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-3",
0)) {
gtkLoaded = setupGtkBase(lib_gtk);
}
}
++++++ 0001-Dynamic-linking-system-libs.patch ++++++
From: John Zimmermann <[email protected]>
--- a/cmake/external/crash_reports/CMakeLists.txt
+++ b/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 @@
desktop-app::external_crashpad
)
endif()
+endif()
--- a/cmake/external/ffmpeg/CMakeLists.txt
+++ b/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 @@
Xrender
)
endif()
+endif()
--- a/cmake/external/openal/CMakeLists.txt
+++ b/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 @@
AL_LIBTYPE_STATIC
AL_ALEXT_PROTOTYPES
)
+endif()
--- a/cmake/external/openssl/CMakeLists.txt
+++ b/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 @@
)
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 @@
${openssl_lib_loc}/libssl.${openssl_lib_ext}
${openssl_lib_loc}/libcrypto.${openssl_lib_ext}
)
+endif()
if (LINUX)
if (DESKTOP_APP_USE_GLIBC_WRAPS)
--- a/cmake/external/opus/CMakeLists.txt
+++ b/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 @@
opus
)
endif()
+endif()
--- a/cmake/external/qt/CMakeLists.txt
+++ b/cmake/external/qt/CMakeLists.txt
@@ -15,6 +15,36 @@
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 @@
pthread
)
endif()
+endif()
--- a/cmake/external/qt/package.cmake
+++ b/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 @@
endif()
set(Qt5_DIR ${qt_loc}/lib/cmake/Qt5)
+endif()
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
--- a/cmake/external/zlib/CMakeLists.txt
+++ b/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 @@
else()
target_link_static_libraries(external_zlib INTERFACE z)
endif()
+endif()
--- a/cmake/init_target.cmake
+++ b/cmake/init_target.cmake
@@ -27,7 +27,7 @@
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
--- a/cmake/options_linux.cmake
+++ b/cmake/options_linux.cmake
@@ -25,6 +25,9 @@
-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 @@
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()
--- a/cmake/variables.cmake
+++ b/cmake/variables.cmake
@@ -10,6 +10,7 @@
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 @@
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")
--- a/cmake/external/lz4/CMakeLists.txt
+++ b/cmake/external/lz4/CMakeLists.txt
@@ -4,8 +4,18 @@
# For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ add_library(external_lz4 INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_lz4 ALIAS external_lz4)
+
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(LZ4 REQUIRED liblz4)
+ target_link_libraries(external_lz4 INTERFACE ${LZ4_LIBRARIES})
+ target_include_directories(external_lz4 SYSTEM INTERFACE
${LZ4_INCLUDE_DIRS})
+else()
add_library(external_lz4 OBJECT)
add_library(desktop-app::external_lz4 ALIAS external_lz4)
+
init_target(external_lz4 "(external)")
set(lz4_loc ${third_party_loc}/lz4/lib)
@@ -27,3 +37,4 @@
PUBLIC
${lz4_loc}
)
+endif()
--- a/cmake/external/xxhash/CMakeLists.txt
+++ b/cmake/external/xxhash/CMakeLists.txt
@@ -7,6 +7,10 @@
add_library(external_xxhash INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_xxhash ALIAS external_xxhash)
+if(DESKTOP_APP_USE_SYSTEM_LIBS)
+ find_library(xxhash_LIBRARIES xxhash)
+ target_link_libraries(external_xxhash INTERFACE ${xxhash_LIBRARIES})
+else()
target_include_directories(external_xxhash SYSTEM
INTERFACE
${third_party_loc}/xxHash
@@ -16,3 +20,4 @@
INTERFACE
XXH_INLINE_ALL
)
+endif()
++++++ 0002-Dynamic-linking-system-qt.patch ++++++
>From 85ae791a9ebf5a2603f12d2a6e2d75549a01d701 Mon Sep 17 00:00:00 2001
From: John Zimmermann <[email protected]>
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
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -934,9 +934,9 @@
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 @@
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>)
--- /dev/null
+++ b/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;
+}
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -8,6 +8,13 @@
#include "core/launcher.h"
int main(int argc, char *argv[]) {
+ // Telegram doesn't start when platform theme is set, see
launchpad.net/bugs/1680943
+ unsetenv("QT_QPA_PLATFORMTHEME");
+ // unset QT screen scale related envvars, see
bugs.archlinux.org/task/62594
+ unsetenv("QT_SCREEN_SCALE_FACTORS");
+ unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR");
+ unsetenv("QT_SCALE_FACTOR");
+ unsetenv("QT_DEVICE_PIXEL_RATIO");
const auto launcher = Core::Launcher::Create(argc, argv);
return launcher ? launcher->exec() : 1;
}
--- a/Telegram/lib_ui/qt_conf/linux.qrc
+++ b/Telegram/lib_ui/qt_conf/linux.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/qt/etc">
- <file alias="qt.conf">qt_linux.conf</file>
</qresource>
<qresource prefix="/fc">
<file>fc-custom.conf</file>
++++++ default-gtk2.patch -> 0004-gtk3.patch ++++++
--- /work/SRC/openSUSE:Factory/telegram-desktop/default-gtk2.patch
2019-11-26 16:52:38.096243436 +0100
+++ /work/SRC/openSUSE:Factory/.telegram-desktop.new.26092/0004-gtk3.patch
2020-01-18 12:18:22.191146590 +0100
@@ -1,37 +1,22 @@
-diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-index 5071d63..f8c0f20 100644
---- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-@@ -237,15 +237,15 @@ void start() {
- bool indicatorLoaded = false;
- bool isWayland =
QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
- QLibrary lib_gtk, lib_indicator;
-- if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) ||
loadLibrary(lib_indicator, "appindicator3", 1)) {
-- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
-+ if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) ||
loadLibrary(lib_indicator, "appindicator", 1)) {
-+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
- gtkLoaded = setupGtkBase(lib_gtk);
- indicatorLoaded = setupAppIndicator(lib_indicator);
- }
- }
- if ((!gtkLoaded || !indicatorLoaded) && !isWayland) {
-- if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) ||
loadLibrary(lib_indicator, "appindicator", 1)) {
-- if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
-+ if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) ||
loadLibrary(lib_indicator, "appindicator3", 1)) {
-+ if (loadLibrary(lib_gtk, "gtk-3", 0)) {
- gtkLoaded = indicatorLoaded = false;
- gtkLoaded = setupGtkBase(lib_gtk);
- indicatorLoaded =
setupAppIndicator(lib_indicator);
-@@ -255,10 +255,10 @@ void start() {
+From ef30081973681f4f8d261917fa763b00adfbe6e9 Mon Sep 17 00:00:00 2001
+From: John Zimmermann <[email protected]>
+Date: Thu, 2 Jan 2020 13:10:31 +0100
+Subject: [PATCH] gtk3
+
+---
+ Telegram/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Telegram/CMakeLists.txt
++++ b/Telegram/CMakeLists.txt
+@@ -1018,8 +1018,8 @@
+ if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
+ find_package(PkgConfig REQUIRED)
- // If no appindicator, try at least load gtk.
- if (!gtkLoaded && !indicatorLoaded) {
-- if (loadLibrary(lib_gtk, "gtk-3", 0)) {
-+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
- gtkLoaded = setupGtkBase(lib_gtk);
- }
-- if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk,
"gtk-x11-2.0", 0)) {
-+ if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-3",
0)) {
- gtkLoaded = setupGtkBase(lib_gtk);
- }
- }
+- 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
++++++ 0005-Use-system-wide-fonts.patch ++++++
Do not force custom fontconfig configuration.
--- a/Telegram/lib_ui/fonts/fonts.qrc
+++ b/Telegram/lib_ui/fonts/fonts.qrc
@@ -1,10 +1,4 @@
<RCC>
<qresource prefix="/gui/fonts">
- <file>DAOpenSansRegular.ttf</file>
- <file>DAOpenSansRegularItalic.ttf</file>
- <file>DAOpenSansBold.ttf</file>
- <file>DAOpenSansBoldItalic.ttf</file>
- <file>DAOpenSansSemibold.ttf</file>
- <file>DAOpenSansSemiboldItalic.ttf</file>
</qresource>
</RCC>
--- a/Telegram/lib_ui/ui/style/style_core_font.cpp
+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp
@@ -94,12 +94,12 @@
FontTypesCount,
};
QString FontTypeNames[FontTypesCount] = {
- "DAOpenSansRegular",
- "DAOpenSansRegularItalic",
- "DAOpenSansBold",
- "DAOpenSansBoldItalic",
- "DAOpenSansSemibold",
- "DAOpenSansSemiboldItalic",
+ "Open Sans",
+ "Open Sans",
+ "Open Sans",
+ "Open Sans",
+ "Open Sans Semibold",
+ "Open Sans Semibold",
};
int32 FontTypeFlags[FontTypesCount] = {
0,
@@ -135,7 +135,7 @@
for (auto i = 0; i != FontTypesCount; ++i) {
const auto name = FontTypeNames[i];
const auto flags = FontTypeFlags[i];
- areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf",
name, flags);
+ areGood[i] = ValidateFont(name, flags);
Overrides[i] = name;
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans
Semibold not loading.
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -82,8 +82,6 @@
return;
}
}
-
- QFile(":/fc/fc-custom.conf").copy(custom);
#endif // TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
}
--- a/Telegram/lib_ui/qt_conf/linux.qrc
+++ b/Telegram/lib_ui/qt_conf/linux.qrc
@@ -2,6 +2,5 @@
<qresource prefix="/qt/etc">
</qresource>
<qresource prefix="/fc">
- <file>fc-custom.conf</file>
</qresource>
</RCC>
++++++ 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch ++++++
>From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001
From: Jiachen YANG <[email protected]>
Date: Fri, 4 Oct 2019 16:59:26 +0900
Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold."
This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf.
---
Telegram/lib_ui/ui/style/style_core_font.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/Telegram/lib_ui/ui/style/style_core_font.cpp
+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp
@@ -225,9 +225,9 @@
f.setPixelSize(size);
if (_flags & FontBold) {
- f.setBold(true);
- //} else if (fontFamilies[family] == "Open Sans Semibold") {
- // f.setWeight(QFont::DemiBold);
+ f.setBold(_flags & FontBold);
+ } else if (fontFamilies[family] == "Open Sans Semibold") {
+ f.setWeight(QFont::DemiBold);
}
f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline);
++++++ range-v3-master.zip ++++++
Binary files /var/tmp/diff_new_pack.8z9nrB/_old and
/var/tmp/diff_new_pack.8z9nrB/_new differ
