commit 2558a47c1b8ebc5d9363cfb4fc3ccb30a61ee4b3 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Aug 4 20:56:14 2017 +0500 Updated to version 1.1.19. Moved VoIP library into a separate package. .gitignore | 1 + fix_libtgvoip.patch | 40 --------------- sources | 3 +- ...ora.patch => telegram-desktop-build-fixes.patch | 24 +++++---- telegram-desktop.spec | 59 +++++----------------- 5 files changed, 29 insertions(+), 98 deletions(-) --- diff --git a/.gitignore b/.gitignore index 88a0a76..2bbc98c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /tdesktop-1.1.15.tar.gz /tdesktop-1.1.17.tar.gz /tdesktop-1.1.18.tar.gz +/tdesktop-1.1.19.tar.gz diff --git a/sources b/sources index 210b425..97278ee 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz 0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz -c54cfa5050035c2f981aec6731829926 libtgvoip-e42287b.tar.gz -e2950a7b0e05bb3fce6d5dce1c47c7b6 tdesktop-1.1.18.tar.gz +f7fb9f0f5b1106d3fc65c82355fadbe8 tdesktop-1.1.19.tar.gz diff --git a/fix_build_under_fedora.patch b/telegram-desktop-build-fixes.patch similarity index 97% rename from fix_build_under_fedora.patch rename to telegram-desktop-build-fixes.patch index c4bc0ae..a979297 100644 --- a/fix_build_under_fedora.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From 7b1127cfb2c4b0a86fc3c715a28ae95c076efec4 Mon Sep 17 00:00:00 2001 +From 91c843f152caa7bbbdedf602cf0c5450872bd5dc Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri, 31 Mar 2017 14:29:58 +0200 Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. @@ -11,16 +11,16 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. Telegram/SourceFiles/ui/text/text_block.cpp | 2 +- Telegram/SourceFiles/ui/twidget.cpp | 4 +- Telegram/gyp/PrecompiledHeader.cmake | 4 +- - Telegram/gyp/Telegram.gyp | 20 ++---- + Telegram/gyp/Telegram.gyp | 21 ++----- Telegram/gyp/qt.gypi | 80 +++++++----------------- Telegram/gyp/qt_rcc.gypi | 2 +- Telegram/gyp/settings_linux.gypi | 8 +-- - Telegram/gyp/telegram_linux.gypi | 58 +++++------------- + Telegram/gyp/telegram_linux.gypi | 60 +++++------------- Telegram/gyp/telegram_sources.txt | 8 +-- Telegram/gyp/utils.gyp | 4 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- - 16 files changed, 164 insertions(+), 155 deletions(-) + 16 files changed, 166 insertions(+), 156 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp @@ -243,7 +243,7 @@ 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 9d92b817..9b456dee 100644 +index 9d92b817..f275c105 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -31,7 +31,6 @@ @@ -254,12 +254,12 @@ index 9d92b817..9b456dee 100644 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap', 'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions', 'style_files': [ -@@ -79,32 +78,25 @@ +@@ -79,32 +78,24 @@ 'codegen.gyp:codegen_lang', 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', - 'utils.gyp:Updater', - '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', +- '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', ], 'defines': [ @@ -499,10 +499,10 @@ index fde88dcd..7d603220 100644 'Debug': { }, diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index 2c464928..1b14723d 100644 +index 2c464928..3566d002 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi -@@ -27,73 +27,43 @@ +@@ -27,73 +27,45 @@ # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], @@ -524,6 +524,7 @@ index 2c464928..1b14723d 100644 + '<!(rpm --eval "%{_includedir}")/ffmpeg', + '<!(rpm --eval "%{_includedir}")/minizip', + '<!(rpm --eval "%{_includedir}")/opus', ++ '<!(rpm --eval "%{_includedir}")/libtgvoip', ], 'library_dirs': [ - '/usr/local/lib', @@ -563,6 +564,7 @@ index 2c464928..1b14723d 100644 + 'avutil', + 'z', + 'minizip', ++ 'tgvoip', # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ @@ -591,10 +593,10 @@ index 2c464928..1b14723d 100644 }, }, diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index d528bcc2..f340589d 100644 +index 40556793..15ff65c9 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -584,13 +584,7 @@ +@@ -588,13 +588,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win diff --git a/telegram-desktop.spec b/telegram-desktop.spec index bb811d6..2e213b6 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -1,6 +1,5 @@ # Telegram Desktop's constants... %global appname tdesktop -%global voipver 1.0 # Git revision of GYP... %global commit1 a478c1ab51ea3e04e79791ac3d1dad01b3f57434 @@ -10,20 +9,15 @@ %global commit2 c5851a8161938798c5594a66420cb814fea92711 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) -# Git revision of libtgvoip... -%global commit3 e42287b6f4a520b7ddabc6cdcff205f4e7e216ec -%global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) - Summary: Telegram is a new era of messaging Name: telegram-desktop -Version: 1.1.18 -Release: 1%{?dist} +Version: 1.1.19 +Release: 2%{?dist} # Application and 3rd-party modules licensing: # * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source; # * S1 (GYP) - BSD -- build-time dependency; # * S2 (GSL) - MIT -- build-time dependency; -# * S3 (libtgvoip) - Public Domain -- shared library; # * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency. License: GPLv3+ and LGPLv3 and BSD and MIT Group: Applications/Internet @@ -33,14 +27,11 @@ ExclusiveArch: i686 x86_64 Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz Source1: https://chromium.googlesource.com/external/gyp/+archive/%{commit1}.tar.gz... Source2: https://github.com/Microsoft/GSL/archive/%{commit2}.tar.gz#/GSL-%{shortco... -Source3: https://github.com/grishka/libtgvoip/archive/%{commit3}.tar.gz#/libtgvoip... -Patch0: fix_build_under_fedora.patch -Patch1: fix_libtgvoip.patch +Patch0: %{name}-build-fixes.patch -Provides: libtgvoip = %{voipver} -Requires: hicolor-icon-theme Requires: qt5-qtimageformats%{?_isa} +Requires: hicolor-icon-theme Requires: gtk3%{?_isa} %if 0%{?fedora} && 0%{?fedora} >= 24 Recommends: libappindicator-gtk3%{?_isa} @@ -60,17 +51,14 @@ BuildRequires: mapbox-variant-devel BuildRequires: ffmpeg-devel >= 3.1 BuildRequires: openal-soft-devel BuildRequires: qt5-qtbase-devel +BuildRequires: libtgvoip-devel BuildRequires: libstdc++-devel BuildRequires: minizip-devel +BuildRequires: opus-devel BuildRequires: gtk3-devel BuildRequires: dee-devel BuildRequires: xz-devel -# Development packages for libtgvoip... -BuildRequires: pulseaudio-libs-devel -BuildRequires: alsa-lib-devel -BuildRequires: opus-devel - # Additional development packages... %if 0%{?fedora} && 0%{?fedora} >= 26 BuildRequires: compat-openssl10-devel @@ -92,8 +80,7 @@ personal or business messaging needs. %prep # Unpacking Telegram Desktop source archive... -%setup -qn %{appname}-%{version} -%patch0 -p1 +%autosetup -n %{appname}-%{version} -p1 # Unpacking GYP... mkdir -p Telegram/ThirdParty/gyp @@ -109,22 +96,7 @@ pushd Telegram/ThirdParty mv GSL-%{commit2} GSL popd -# Unpacking libtgvoip... -pushd Telegram/ThirdParty - rm -rf libtgvoip - tar -xf %{SOURCE3} - mv libtgvoip-%{commit3} libtgvoip -popd - -# Patching libtgvoip... -pushd Telegram/ThirdParty/libtgvoip -%patch1 -p1 -popd - %build -# Exporting some additional constants... -export VOIPVER="%{voipver}" - # Generating cmake script using GYP... pushd Telegram/gyp ../ThirdParty/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake @@ -142,12 +114,6 @@ mkdir -p "%{buildroot}%{_bindir}" chrpath -d out/Release/Telegram install -m 0755 -p out/Release/Telegram "%{buildroot}%{_bindir}/%{name}" -# Installing shared libraries... -mkdir -p "%{buildroot}%{_libdir}" -install -m 0755 -p out/Release/lib.target/libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.%{voipver}" -ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.1" -ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so" - # Installing desktop shortcut... mv lib/xdg/telegramdesktop.desktop lib/xdg/%{name}.desktop desktop-file-install --dir="%{buildroot}%{_datadir}/applications" lib/xdg/%{name}.desktop @@ -171,7 +137,6 @@ install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml" %post -/sbin/ldconfig %if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) /bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : %endif @@ -181,7 +146,6 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.a %endif %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then %if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : @@ -201,15 +165,20 @@ fi %files %doc README.md changelog.txt -%license LICENSE Telegram/ThirdParty/libtgvoip/UNLICENSE +%license LICENSE %{_bindir}/%{name} -%{_libdir}/libtgvoip.* %{_datadir}/applications/%{name}.desktop %{_datadir}/kde4/services/tg.protocol %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Fri Aug 04 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.19-2 +- Moved VoIP library into a separate package. + +* Wed Aug 02 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.19-1 +- Updated to 1.1.19. + * Thu Jul 27 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.18-1 - Updated to 1.1.18.