10:15 a.m.
commit b7982fd7c15ab87ad721b91e0c8d1d2713225456
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Dec 17 11:14:53 2019 +0100
Fixed issue with menu bar on Gnome. Rebuilt due to Qt 5.13.2 update on Rawhide.
telegram-desktop-build-fixes.patch | 36 ++++++++++-----------------------
telegram-desktop-system-fonts.patch | 4 ++--
telegram-desktop-unbundle-minizip.patch | 12 +++++------
telegram-desktop.spec | 18 +++++------------
4 files changed, 24 insertions(+), 46 deletions(-)
---
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 78bb616..04270a6 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 6540384e5d22e87c3df80b210562cacd04f2ee64 Mon Sep 17 00:00:00 2001
+From 74a5e11947529b3a1754b4f8d8e6e6d801342baf Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -6,7 +6,6 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
---
Telegram/Resources/qrc/linux.qrc | 6 --
Telegram/Resources/qrc/telegram/telegram.qrc | 3 -
- Telegram/SourceFiles/core/launcher.cpp | 1 +
Telegram/SourceFiles/qt_functions.cpp | 97 ++++++++++++++++++++
Telegram/gyp/CMakeLists.inj | 8 ++
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
@@ -24,12 +23,12 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and
mock.
Telegram/gyp/modules/qt.gypi | 87 +++++-------------
Telegram/gyp/modules/qt_moc.gypi | 5 +-
Telegram/gyp/modules/qt_rcc.gypi | 2 +-
- Telegram/gyp/telegram/linux.gypi | 36 ++------
+ Telegram/gyp/telegram/linux.gypi | 34 ++-----
Telegram/gyp/telegram/sources.txt | 2 +-
Telegram/gyp/telegram/telegram.gypi | 23 +----
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 5 +-
- 25 files changed, 184 insertions(+), 211 deletions(-)
+ 24 files changed, 183 insertions(+), 209 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -60,18 +59,6 @@ index 87ee77587..ae30de1a9 100644
<qresource prefix="/misc">
<file
alias="default_shortcuts-custom.json">../../default_shortcuts-custom.json</file>
</qresource>
-diff --git a/Telegram/SourceFiles/core/launcher.cpp
b/Telegram/SourceFiles/core/launcher.cpp
-index 3ba28309b..0fc14253d 100644
---- a/Telegram/SourceFiles/core/launcher.cpp
-+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -272,6 +272,7 @@ int Launcher::exec() {
- Logs::start(this); // must be started before Platform is started
- Platform::start(); // must be started before Sandbox is created
-
-+ unsetenv("QT_QPA_PLATFORMTHEME");
- auto result = executeApplication();
-
- DEBUG_LOG(("Telegram finished, result: %1").arg(result));
diff --git a/Telegram/SourceFiles/qt_functions.cpp
b/Telegram/SourceFiles/qt_functions.cpp
new file mode 100644
index 000000000..a7c697f25
@@ -728,7 +715,7 @@ index f5624a82b..b644ce29f 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
-index 385f2b89f..9875d7bf8 100644
+index 385f2b89f..ed20a849f 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -10,7 +10,7 @@
@@ -740,7 +727,7 @@ index 385f2b89f..9875d7bf8 100644
'pkgconfig_libs': [
# In order to work libxkbcommon must be linked statically,
# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
-@@ -20,26 +20,17 @@
+@@ -20,12 +20,6 @@
],
},
'libraries': [
@@ -750,14 +737,13 @@ index 385f2b89f..9875d7bf8 100644
- '-lfcitxplatforminputcontextplugin',
- '-lhimeplatforminputcontextplugin',
- '-lnimfplatforminputcontextplugin',
-- '-llzma',
+ '-llzma',
'-lopenal',
'-lavformat',
- '-lavcodec',
- '-lswresample',
+@@ -34,12 +28,11 @@
'-lswscale',
'-lavutil',
-- '-lopus',
+ '-lopus',
- '-lva-x11',
- '-lva-drm',
- '-lva',
@@ -765,13 +751,13 @@ index 385f2b89f..9875d7bf8 100644
- '-ldrm',
'-lz',
+ '-ltgvoip',
-+ '-llzma',
+ '-lxxhash',
+ '-llz4',
++ '-lwebp',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -47,36 +38,23 @@
+@@ -47,36 +40,23 @@
'-Wno-maybe-uninitialized',
],
'ldflags': [
@@ -926,5 +912,5 @@ index bb2a8ea79..960eaef0f 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.21.0
+2.23.0
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 3dba448..5e39e1e 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From eb3fe9e6ad1f3a52c5f8e7c104114a48a5609aaf Mon Sep 17 00:00:00 2001
+From 65714d5659182d75ea8f67e78b0910d4aed2d56a Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
@@ -40,5 +40,5 @@ index 653dbfff0..62527327f 100644
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--
-2.21.0
+2.23.0
diff --git a/telegram-desktop-unbundle-minizip.patch
b/telegram-desktop-unbundle-minizip.patch
index ec4a0c9..925d64e 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From caa1132fb7f615e86088799b04e5f06b86fb8970 Mon Sep 17 00:00:00 2001
+From b0a1116bebfbe573646f28cb34e78ad93cbeacd9 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
@@ -23,17 +23,17 @@ index 919eb3c8a..d7d5f6c12 100644
'<!(rpm --eval "%{_includedir}")/libtgvoip',
'<!(rpm --eval
"%{_includedir}")/guidelines-support-library',
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
-index 9875d7bf8..694adbc4d 100644
+index ed20a849f..0ac159d8a 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
-@@ -27,6 +27,7 @@
- '-lswscale',
+@@ -29,6 +29,7 @@
'-lavutil',
+ '-lopus',
'-lz',
+ '-lminizip',
'-ltgvoip',
- '-llzma',
'-lxxhash',
+ '-llz4',
diff --git a/Telegram/gyp/telegram/sources.txt b/Telegram/gyp/telegram/sources.txt
index e69292202..547e9861a 100644
--- a/Telegram/gyp/telegram/sources.txt
@@ -74,5 +74,5 @@ index fe4df2c2d..22649c077 100644
'<(submodules_loc)/crl/src',
],
--
-2.21.0
+2.23.0
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 4955089..125cfc9 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -29,7 +29,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
Version: 1.8.15
-Release: 1%{?dist}
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -216,20 +216,12 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Tue Dec 17 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.15-2
+- Fixed issue with menu bar on Gnome.
+- Rebuilt due to Qt 5.13.2 update on Rawhide.
+
* Wed Oct 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.15-1
- Updated to version 1.8.15.
* Thu Oct 03 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.13-1
- Updated to version 1.8.13.
-
-* Wed Oct 02 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.12-1
-- Updated to version 1.8.12.
-
-* Wed Oct 02 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.11-1
-- Updated to version 1.8.11.
-
-* Sat Sep 28 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.9-1
-- Updated to version 1.8.9.
-
-* Tue Sep 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.8-1
-- Updated to version 1.8.8.