commit 09be6eda7907ec2ee387c0c13669fe4ce01bf860 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed Jul 19 21:52:18 2017 +0500 Updated to version 1.1.14. .gitignore | 1 + fix_build_under_fedora.patch | 36 ++++++++++---------- sources | 2 +- telegram-desktop.spec | 80 ++++++++++++++++++-------------------------- 4 files changed, 53 insertions(+), 66 deletions(-) --- diff --git a/.gitignore b/.gitignore index 439cf1b..8c672ff 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /tdesktop-1.1.11.tar.gz /libtgvoip-de33700.tar.gz /tdesktop-1.1.13.tar.gz +/tdesktop-1.1.14.tar.gz diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch index 07663cb..1ae0a56 100644 --- a/fix_build_under_fedora.patch +++ b/fix_build_under_fedora.patch @@ -1,4 +1,4 @@ -From 969ddbc6cff0decc00d189ee2ec257e4c3f2c0b5 Mon Sep 17 00:00:00 2001 +From d962adafed6e0b840b507e6c0e7537d5e993dc2f 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. @@ -24,7 +24,7 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. create mode 100644 Telegram/SourceFiles/qt_functions.cpp diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp -index 6cd942e..d7d1b53 100644 +index 6cd942ec..d7d1b535 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -23,9 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org @@ -56,7 +56,7 @@ index 6cd942e..d7d1b53 100644 { diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp new file mode 100644 -index 0000000..4a722b8 +index 00000000..4a722b8d --- /dev/null +++ b/Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ @@ -155,7 +155,7 @@ index 0000000..4a722b8 + flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index b975c7a..f2f876b 100644 +index b975c7a8..f2f876b3 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp @@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) @@ -173,7 +173,7 @@ index b975c7a..f2f876b 100644 -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp -index 9ab1394..cec6589 100644 +index 9ab13940..cec6589e 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -1688,11 +1688,11 @@ private: @@ -192,7 +192,7 @@ index 9ab1394..cec6589 100644 auto blockIndex = _lineStartBlock; auto currentBlock = _t->_blocks[blockIndex].get(); diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp -index f89644e..35230cf 100644 +index f89644e1..35230cfc 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp @@ -330,7 +330,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi @@ -205,7 +205,7 @@ index f89644e..35230cf 100644 layout.createLine(); diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index e9848ef..dcee47e 100644 +index e9848ef2..dcee47ee 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -191,9 +191,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton @@ -221,7 +221,7 @@ index e9848ef..dcee47e 100644 ev.setTimestamp(getms()); QGuiApplication::sendEvent(windowHandle, &ev); diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake -index 5d6830e..c3f08d3 100644 +index 5d6830e9..c3f08d3f 100644 --- a/Telegram/gyp/PrecompiledHeader.cmake +++ b/Telegram/gyp/PrecompiledHeader.cmake @@ -112,7 +112,7 @@ function(add_precompiled_header _target _input) @@ -243,7 +243,7 @@ index 5d6830e..c3f08d3 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 80160d1..9dcdeb4 100644 +index 80160d16..9dcdeb4d 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -31,7 +31,6 @@ @@ -290,7 +290,7 @@ index 80160d1..9dcdeb4 100644 '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 81c13a1..899af14 100644 +index 81c13a18..899af140 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -27,25 +27,21 @@ @@ -449,7 +449,7 @@ index 81c13a1..899af14 100644 # Silence "Note: No relevant classes found. No output generated." '--no-notes', diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi -index eebc696..3efa7d0 100644 +index eebc6967..3efa7d05 100644 --- a/Telegram/gyp/qt_rcc.gypi +++ b/Telegram/gyp/qt_rcc.gypi @@ -28,7 +28,7 @@ @@ -462,7 +462,7 @@ index eebc696..3efa7d0 100644 '-no-compress', '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi -index fde88dc..7d60322 100644 +index fde88dcd..7d603220 100644 --- a/Telegram/gyp/settings_linux.gypi +++ b/Telegram/gyp/settings_linux.gypi @@ -22,11 +22,6 @@ @@ -495,7 +495,7 @@ index fde88dc..7d60322 100644 'Debug': { }, diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index 2c46492..1b14723 100644 +index 2c464928..1b14723d 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -27,73 +27,43 @@ @@ -587,7 +587,7 @@ index 2c46492..1b14723 100644 }, }, diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 8363ab4..b5f631c 100644 +index 8363ab4f..b5f631c2 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -579,13 +579,7 @@ @@ -606,7 +606,7 @@ index 8363ab4..b5f631c 100644 platforms: mac <(sp_media_key_tap_loc)/SPMediaKeyTap.m diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp -index 209c737..27ce77f 100644 +index 209c7370..27ce77f5 100644 --- a/Telegram/gyp/utils.gyp +++ b/Telegram/gyp/utils.gyp @@ -134,7 +134,7 @@ @@ -628,7 +628,7 @@ index 209c737..27ce77f 100644 }] ], diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml -index 7bcf8d8..4508c01 100644 +index 7bcf8d83..4508c01c 100644 --- a/lib/xdg/telegramdesktop.appdata.xml +++ b/lib/xdg/telegramdesktop.appdata.xml @@ -1,6 +1,6 @@ @@ -640,7 +640,7 @@ index 7bcf8d8..4508c01 100644 <project_license>GPL-3.0</project_license> <name>Telegram Desktop</name> diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop -index 0a80695..550b9f7 100644 +index 0a806951..550b9f78 100644 --- a/lib/xdg/telegramdesktop.desktop +++ b/lib/xdg/telegramdesktop.desktop @@ -1,9 +1,11 @@ @@ -658,5 +658,5 @@ index 0a80695..550b9f7 100644 StartupWMClass=TelegramDesktop Type=Application -- -2.9.4 +2.13.3 diff --git a/sources b/sources index 0836665..493bc18 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz 0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz 64d96402e97bc7bd11e36668d4e129e9 libtgvoip-de33700.tar.gz -437d8bcbe05428f7cd427b57b90edbc3 tdesktop-1.1.13.tar.gz +cec5c09cd3f4d36ed33ee74023a6a325 tdesktop-1.1.14.tar.gz diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 30c8ad7..d8b3a16 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -16,7 +16,7 @@ Summary: Telegram is a new era of messaging Name: telegram-desktop -Version: 1.1.13 +Version: 1.1.14 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -42,54 +42,37 @@ Provides: libtgvoip = %{voipver} Requires: hicolor-icon-theme Requires: qt5-qtimageformats%{?_isa} Requires: gtk3%{?_isa} -%if 0%{?fedora} >= 24 +%if 0%{?fedora} && 0%{?fedora} >= 24 Recommends: libappindicator-gtk3%{?_isa} %endif +# Compilers and tools... BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: ffmpeg-devel >= 3.1 -BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtimageformats BuildRequires: chrpath BuildRequires: cmake -BuildRequires: libproxy-devel -BuildRequires: libxcb-devel -BuildRequires: libogg-devel -BuildRequires: xz-devel -BuildRequires: minizip-devel +BuildRequires: gcc + +# Development packages for Telegram Desktop... BuildRequires: libappindicator-devel -BuildRequires: libunity-devel -BuildRequires: libstdc++-devel -BuildRequires: libwebp-devel -BuildRequires: libpng-devel -BuildRequires: xorg-x11-util-macros -BuildRequires: gettext-devel -BuildRequires: libICE-devel -BuildRequires: libSM-devel -BuildRequires: libXi-devel -BuildRequires: zlib-devel -BuildRequires: opus-devel -BuildRequires: portaudio-devel +BuildRequires: mapbox-variant-devel +BuildRequires: ffmpeg-devel >= 3.1 BuildRequires: openal-soft-devel -BuildRequires: xcb-util-devel -BuildRequires: xcb-util-wm-devel -BuildRequires: xcb-util-xrm-devel -BuildRequires: xcb-util-image-devel -BuildRequires: xcb-util-cursor-devel -BuildRequires: xcb-util-keysyms-devel -BuildRequires: xcb-util-renderutil-devel -BuildRequires: libva-devel -BuildRequires: libvdpau-devel -BuildRequires: libxkbcommon-devel -BuildRequires: libxkbcommon-x11-devel -BuildRequires: harfbuzz-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: libstdc++-devel +BuildRequires: minizip-devel BuildRequires: gtk3-devel +BuildRequires: dee-devel +BuildRequires: xz-devel + +# Development packages for libtgvoip... BuildRequires: pulseaudio-libs-devel -BuildRequires: mapbox-variant-devel -%if 0%{?fedora} >= 26 +BuildRequires: alsa-lib-devel +BuildRequires: opus-devel + +# Additional development packages... +%if 0%{?fedora} && 0%{?fedora} >= 26 BuildRequires: compat-openssl10-devel %else BuildRequires: openssl-devel @@ -157,11 +140,11 @@ popd # Installing executables... mkdir -p "%{buildroot}%{_bindir}" chrpath -d out/Release/Telegram -install -m 755 out/Release/Telegram "%{buildroot}%{_bindir}/%{name}" +install -m 0755 -p out/Release/Telegram "%{buildroot}%{_bindir}/%{name}" # Installing shared libraries... mkdir -p "%{buildroot}%{_libdir}" -install -m 755 out/Release/lib.target/libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.%{voipver}" +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.0" ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so" @@ -173,45 +156,45 @@ desktop-file-install --dir="%{buildroot}%{_datadir}/applications" lib/xdg/%{name for size in 16 32 48 64 128 256 512; do dir="%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps" install -d "$dir" - install -m 644 -p Telegram/Resources/art/icon${size}.png "$dir/%{name}.png" + install -m 0644 -p Telegram/Resources/art/icon${size}.png "$dir/%{name}.png" done # Installing tg protocol handler... install -d "%{buildroot}%{_datadir}/kde4/services" -install -m 644 -p lib/xdg/tg.protocol "%{buildroot}%{_datadir}/kde4/services/tg.protocol" +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 644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml" +install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml" %check appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml" %post /sbin/ldconfig -%if 0%{?fedora} <= 23 || 0%{?rhel} == 7 +%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) /bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : %endif /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%if 0%{?fedora} <= 24 || 0%{?rhel} == 7 +%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7) /usr/bin/update-desktop-database &> /dev/null || : %endif %postun /sbin/ldconfig if [ $1 -eq 0 ] ; then - %if 0%{?fedora} <= 23 || 0%{?rhel} == 7 + %if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %endif /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%if 0%{?fedora} <= 24 || 0%{?rhel} == 7 +%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7) /usr/bin/update-desktop-database &> /dev/null || : %endif %posttrans -%if 0%{?fedora} <= 23 || 0%{?rhel} == 7 +%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %endif /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -227,6 +210,9 @@ fi %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Wed Jul 19 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.14-1 +- Updated to 1.1.14 (alpha). + * Fri Jul 14 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.13-1 - Updated to 1.1.13 (alpha).