1:36 p.m.
commit 14fd9cfac84eae1e0877aed5f1996ab68a0ccd95
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 25 14:36:02 2018 +0100
Updated to version 1.2.8 (alpha).
Do not build for stable Fedora releases!
.gitignore | 2 ++
sources | 4 +--
telegram-desktop-build-fixes.patch | 57 +++++++++++++++++++-------------------
telegram-desktop.spec | 51 ++++++++++++++--------------------
4 files changed, 53 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7205239..79129ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@
/tdesktop-1.2.1.tar.gz
/crl-9e11a5c.tar.gz
/tdesktop-1.2.6.tar.gz
+/crl-344cbde.tar.gz
+/tdesktop-1.2.8.tar.gz
diff --git a/sources b/sources
index b305db0..f5780f2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a3280a044625e250ca4d4df1cd13fe80 crl-9e11a5c.tar.gz
-b7c9c19d164323b73e5bb192b755345e tdesktop-1.2.6.tar.gz
+ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz
+33f99322144c3e6d01a838b502790042 tdesktop-1.2.8.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 6eeb80d..45c650f 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From ceed396b282092a70ff819b17552e3e31419847d Mon Sep 17 00:00:00 2001
+From 03fc7824640665d679c559ecc14063b79abf5a50 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] Fixed build under Fedora using rpmbuild and mock.
@@ -14,11 +14,11 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/qt_moc.gypi | 3 +-
Telegram/gyp/qt_rcc.gypi | 2 +-
Telegram/gyp/settings_linux.gypi | 5 --
- Telegram/gyp/telegram_linux.gypi | 85 +++++++---------------------
+ Telegram/gyp/telegram_linux.gypi | 84 +++++++--------------------
Telegram/gyp/telegram_sources.txt | 9 +--
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 14 files changed, 157 insertions(+), 167 deletions(-)
+ 14 files changed, 156 insertions(+), 167 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -33,10 +33,10 @@ index 0554fa17..3ea02740 100644
</qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp
b/Telegram/SourceFiles/core/launcher.cpp
-index bf21d14d..73b33feb 100644
+index 7f173565..68f077d2 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -64,6 +64,8 @@ int Launcher::exec() {
+@@ -51,6 +51,8 @@ int Launcher::exec() {
Logs::start(this); // must be started before Platform is started
Platform::start(); // must be started before QApplication is created
@@ -177,10 +177,10 @@ index 5d6830e9..c3f08d3f 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 84a06153..7e6f41b7 100644
+index 62a4197f..a500611a 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
-@@ -31,7 +31,6 @@
+@@ -18,7 +18,6 @@
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
'submodules_loc': '../ThirdParty',
@@ -188,7 +188,7 @@ index 84a06153..7e6f41b7 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc':
'<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -67,8 +66,6 @@
+@@ -54,8 +53,6 @@
'includes': [
'common_executable.gypi',
'telegram_qrc.gypi',
@@ -197,7 +197,7 @@ index 84a06153..7e6f41b7 100644
'telegram_linux.gypi',
'qt.gypi',
'qt_moc.gypi',
-@@ -81,34 +78,23 @@
+@@ -68,34 +65,23 @@
'codegen.gyp:codegen_lang',
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
@@ -238,7 +238,7 @@ index 84a06153..7e6f41b7 100644
'<(submodules_loc)/crl/src',
],
'sources': [
-@@ -126,7 +112,6 @@
+@@ -113,7 +99,6 @@
'CUSTOM_API_ID',
],
'dependencies': [
@@ -247,10 +247,10 @@ index 84a06153..7e6f41b7 100644
}],
],
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index dea127a3..bea656f1 100644
+index 0b783ec2..2d42d344 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
-@@ -27,25 +27,21 @@
+@@ -14,25 +14,21 @@
[ 'build_macold', {
'qt_version%': '5.3.2',
}, {
@@ -278,7 +278,7 @@ index dea127a3..bea656f1 100644
}]
]
},
-@@ -85,32 +81,13 @@
+@@ -72,32 +68,13 @@
],
}],
[ 'build_linux', {
@@ -314,7 +314,7 @@ index dea127a3..bea656f1 100644
],
}],
],
-@@ -135,16 +112,11 @@
+@@ -122,16 +99,11 @@
'qt_loc': '<(qt_loc_unix)',
}],
],
@@ -331,7 +331,7 @@ index dea127a3..bea656f1 100644
},
'configurations': {
-@@ -193,21 +165,21 @@
+@@ -180,21 +152,21 @@
},
'include_dirs': [
@@ -366,7 +366,7 @@ index dea127a3..bea656f1 100644
],
'defines': [
'QT_WIDGETS_LIB',
-@@ -218,32 +190,21 @@
+@@ -205,32 +177,21 @@
'conditions': [
[ 'build_linux', {
'dependencies': [
@@ -403,10 +403,10 @@ index dea127a3..bea656f1 100644
'-rdynamic',
],
diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index fae668dc..7c62da2f 100644
+index 464d3c81..4f4d9cef 100644
--- a/Telegram/gyp/qt_moc.gypi
+++ b/Telegram/gyp/qt_moc.gypi
-@@ -25,11 +25,12 @@
+@@ -12,11 +12,12 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@@ -421,10 +421,10 @@ index fae668dc..7c62da2f 100644
# '<!@(python -c "for s in
\'<(a)(_include_dirs)\'.split(\' \'): print(\'-I\' +
s)")',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
-index eebc6967..3efa7d05 100644
+index f5624a82..b644ce29 100644
--- a/Telegram/gyp/qt_rcc.gypi
+++ b/Telegram/gyp/qt_rcc.gypi
-@@ -28,7 +28,7 @@
+@@ -15,7 +15,7 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@@ -434,10 +434,10 @@ index eebc6967..3efa7d05 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index b93bace4..1a637e93 100644
+index a4b5f58a..9658b5c3 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
-@@ -22,10 +22,6 @@
+@@ -9,10 +9,6 @@
[ 'build_linux', {
'variables': {
'linux_common_flags': [
@@ -448,7 +448,7 @@ index b93bace4..1a637e93 100644
'-fPIC',
'-Wno-unused-variable',
'-Wno-unused-parameter',
-@@ -60,7 +56,6 @@
+@@ -47,7 +43,6 @@
],
'defines': [
'_REENTRANT',
@@ -457,10 +457,10 @@ index b93bace4..1a637e93 100644
],
'cflags_c': [
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index f6918c22..5307a518 100644
+index a5b4b197..05d3dca2 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -28,99 +28,54 @@
+@@ -15,99 +15,53 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
],
@@ -535,7 +535,6 @@ index f6918c22..5307a518 100644
- '-Wl,-wrap,secure_getenv',
- '-Wl,-wrap,clock_gettime',
- '-Wl,--no-as-needed,-lrt',
-+ '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld',
],
'configurations': {
'Release': {
@@ -581,10 +580,10 @@ index f6918c22..5307a518 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 5d2f627e..b5a261f3 100644
+index 11b5c6ff..b765fba9 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -703,7 +703,7 @@
+@@ -702,7 +702,7 @@
<(src_loc)/observer_peer.h
<(src_loc)/passcodewidget.cpp
<(src_loc)/passcodewidget.h
@@ -593,7 +592,7 @@ index 5d2f627e..b5a261f3 100644
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -714,13 +714,6 @@
+@@ -713,13 +713,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index ff38d63..1d72905 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -2,23 +2,22 @@
%global appname tdesktop
# Git revision of crl...
-%global commit1 9e11a5c9291760d03df559d03d81fa7afdd0a46d
+%global commit1 344cbde9ae8d89a6530408d3176d2754ae0ff0e2
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Decrease debuginfo verbosity to reduce memory consumption...
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
-Summary: Telegram is a new era of messaging
+Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.2.6
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
# * S1 (crl) - GPLv3+ -- build-time dependency;
# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv3
-Group: Applications/Internet
URL: https://github.com/telegramdesktop/%{appname}
# Warning! Builds on i686 may fail due to technical limitations of this
@@ -62,14 +61,15 @@ BuildRequires: xz-devel
%description
Telegram is a messaging app with a focus on speed and security, it’s super
fast, simple and free. You can use Telegram on all your devices at the same
-time — your messages sync seamlessly across any of your phones, tablets or
-computers.
+time — your messages sync seamlessly across any number of your phones,
+tablets or computers.
With Telegram, you can send messages, photos, videos and files of any type
-(doc, zip, mp3, etc), as well as create groups for up to 200 people. You can
-write to your phone contacts and find people by their usernames. As a result,
-Telegram is like SMS and email combined — and can take care of all your
-personal or business messaging needs.
+(doc, zip, mp3, etc), as well as create groups for up to 50,000 people or
+channels for broadcasting to unlimited audiences. You can write to your
+phone contacts and find people by their usernames. As a result, Telegram is
+like SMS and email combined — and can take care of all your personal or
+business messaging needs.
%prep
# Unpacking Telegram Desktop source archive...
@@ -119,36 +119,27 @@ install -d "%{buildroot}%{_datadir}/kde4/services"
install -m 0644 -p lib/xdg/tg.protocol
"%{buildroot}%{_datadir}/kde4/services/tg.protocol"
# Installing appdata for Gnome Software...
-install -d "%{buildroot}%{_datadir}/appdata"
-install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml
"%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
+install -d "%{buildroot}%{_datadir}/metainfo"
+install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml
"%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml"
%check
-appstream-util validate-relax --nonet
"%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
-
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+appstream-util validate-relax --nonet
"%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml"
%files
%doc README.md changelog.txt
-%license LICENSE
+%license LICENSE LEGAL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/kde4/services/tg.protocol
%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
-* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.6-2
-- Rebuilt for ffmpeg-3.5 git
+* Wed Jan 03 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.8-1
+- Updated to 1.2.8 (alpha).
+
+* Mon Jan 01 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.7-1
+- Updated to 1.2.7 (alpha).
* Sat Dec 30 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.6-1
- Updated to 1.2.6.