8:21 a.m.
commit 98d4c16bd4ed4392d17704a83b67aec2114924d2
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Dec 24 09:20:46 2019 +0100
Removed GTK2 from build requirements.
telegram-desktop-build-fixes.patch | 15 ++++++++-------
telegram-desktop-system-fonts.patch | 4 ++--
telegram-desktop-unbundle-minizip.patch | 6 +++---
telegram-desktop.spec | 8 +++++---
4 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 934edd3..0776ec5 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 7c42bf1c3db9aabce1f11f6a576e799831b75042 Mon Sep 17 00:00:00 2001
+From a984c7525768df79438c6d58ec4359b21cd609d5 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.
@@ -23,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 | 33 ++-----
+ 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 +-
- 24 files changed, 182 insertions(+), 209 deletions(-)
+ 24 files changed, 182 insertions(+), 210 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -715,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..b32c45bf2 100644
+index 385f2b89f..7f0dcaa99 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -10,7 +10,7 @@
@@ -756,7 +756,7 @@ index 385f2b89f..b32c45bf2 100644
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -47,36 +39,23 @@
+@@ -47,37 +39,23 @@
'-Wno-maybe-uninitialized',
],
'ldflags': [
@@ -791,10 +791,11 @@ index 385f2b89f..b32c45bf2 100644
'cflags_cc': [
- '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
- '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
+- '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
+ '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
- '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
],
}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
+ 'cflags_cc': [ '<!(pkg-config --cflags
ayatana-appindicator3-0.1)' ],
diff --git a/Telegram/gyp/telegram/sources.txt b/Telegram/gyp/telegram/sources.txt
index 38d9d0e64..e69292202 100644
--- a/Telegram/gyp/telegram/sources.txt
@@ -911,5 +912,5 @@ index bb2a8ea79..960eaef0f 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.23.0
+2.24.1
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index c4ab9ff..c2bb9af 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 75ffaa10720678f6776c9da690ab78e84e2a9d4c Mon Sep 17 00:00:00 2001
+From 7dae800678004cf3365d02c582ffb1ffdd571bde 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.23.0
+2.24.1
diff --git a/telegram-desktop-unbundle-minizip.patch
b/telegram-desktop-unbundle-minizip.patch
index 1b5d36a..bc78fc2 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 91740b4965c378195e7dd19f331f7170b98db067 Mon Sep 17 00:00:00 2001
+From 72a41c239ba55ac173955854dee4f3d86f0d225d 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,7 +23,7 @@ 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 b32c45bf2..009e54c3f 100644
+index 7f0dcaa99..702ecaf51 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -29,6 +29,7 @@
@@ -74,5 +74,5 @@ index fe4df2c2d..22649c077 100644
'<(submodules_loc)/crl/src',
],
--
-2.23.0
+2.24.1
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 125cfc9..b61093a 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: 2%{?dist}
+Release: 3%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -93,9 +93,8 @@ BuildRequires: python3
%if %{with gtk3}
Recommends: libappindicator-gtk3%{?_isa}
-BuildRequires: libappindicator-devel
+BuildRequires: libappindicator-gtk3-devel
BuildRequires: gtk3-devel
-BuildRequires: dee-devel
Requires: gtk3%{?_isa}
%endif
@@ -216,6 +215,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Tue Dec 24 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.15-3
+- Removed GTK2 from build requirements.
+
* 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.