From da09a6caad2452606728a540be8c2fad7a3b3816 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 18:22:22 +0100 Subject: [PATCH] automatic version update by autodist [release 3.4.3-1mamba;Tue Jan 04 2022] --- ...m-2.7.4-add_missing_include_optional.patch | 10 +++ telegram-2.7.4-fix-webview-includes.patch | 12 ++++ telegram.spec | 65 +++++++++++++------ 3 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 telegram-2.7.4-add_missing_include_optional.patch create mode 100644 telegram-2.7.4-fix-webview-includes.patch diff --git a/telegram-2.7.4-add_missing_include_optional.patch b/telegram-2.7.4-add_missing_include_optional.patch new file mode 100644 index 0000000..c06cc4f --- /dev/null +++ b/telegram-2.7.4-add_missing_include_optional.patch @@ -0,0 +1,10 @@ +--- tdesktop-2.7.4-full/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.h.orig 2021-05-13 14:25:20.591091208 +0200 ++++ tdesktop-2.7.4-full/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration.h 2021-05-13 17:02:03.571569712 +0200 +@@ -10,6 +10,7 @@ + #include "base/const_string.h" + + #include ++#include + + namespace base { + namespace Platform { diff --git a/telegram-2.7.4-fix-webview-includes.patch b/telegram-2.7.4-fix-webview-includes.patch new file mode 100644 index 0000000..6c54e0c --- /dev/null +++ b/telegram-2.7.4-fix-webview-includes.patch @@ -0,0 +1,12 @@ +diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h +index a7f0f97..c2b21c7 100644 +--- a/webview/platform/linux/webview_linux_webkit_gtk.h ++++ b/webview/platform/linux/webview_linux_webkit_gtk.h +@@ -14,6 +14,7 @@ extern "C" { + #include + #include + #include ++#include + #define signals public + } // extern "C" + diff --git a/telegram.spec b/telegram.spec index 590919a..4c6d641 100644 --- a/telegram.spec +++ b/telegram.spec @@ -1,9 +1,5 @@ -%define qt_ver 5.6.2 -%define qt_patchver %(echo %qt_ver | tr . _) -%define qt_majver %(echo %qt_ver | cut -d. -f1-2) - Name: telegram -Version: 2.6.1 +Version: 3.4.3 Release: 1mamba Summary: The official desktop client for the Telegram messenger Group: Graphical Desktop/Applications/Internet @@ -17,42 +13,48 @@ Source2: tg.protocol Patch0: telegram-1.5.15-tdesktop.patch Patch1: telegram-1.5.15-no-gtk2.patch Patch2: telegram-1.5.15-libtgvoip.patch +Patch3: telegram-2.7.4-fix-webview-includes.patch +Patch4: telegram-2.7.4-add_missing_include_optional.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig -BuildRequires: libGL-devel BuildRequires: libX11-devel -BuildRequires: libatk-devel -BuildRequires: libatomic-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXdamage-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXrandr-devel +BuildRequires: libXtst-devel BuildRequires: libavcodec-ffmpeg-devel BuildRequires: libavformat-ffmpeg-devel BuildRequires: libavutil-ffmpeg-devel -BuildRequires: libcairo-devel -BuildRequires: libdbusmenu-qt5-devel BuildRequires: libgcc -BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel -BuildRequires: libgtk-devel -BuildRequires: libharfbuzz-devel +BuildRequires: libglibmm24-devel BuildRequires: libhunspell-devel +BuildRequires: libjemalloc-devel BuildRequires: libjpeg-devel BuildRequires: liblz4-devel -BuildRequires: liblzma-devel BuildRequires: libminizip1-devel BuildRequires: libopenal-devel BuildRequires: libopenssl-devel BuildRequires: libopus-devel -BuildRequires: libpango-devel -BuildRequires: libqt5-devel +BuildRequires: libpipewire-devel +BuildRequires: librnnoise-devel +BuildRequires: libsigc++2-devel BuildRequires: libstdc++6-devel BuildRequires: libswresample-ffmpeg-devel BuildRequires: libswscale-ffmpeg-devel +BuildRequires: libvpx-devel +BuildRequires: libwayland-devel BuildRequires: libxcb-devel BuildRequires: libxcb-keysyms-devel -BuildRequires: libxkbcommon-devel BuildRequires: libxxhash-devel BuildRequires: libz-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qtwayland-devel ## AUTOBUILDREQ-END #BuildRequires: libbreakpad-devel BuildRequires: range-v3-devel @@ -61,25 +63,40 @@ BuildRequires: range-v3-devel >= 0.11.0 BuildRequires: libtg_owt-devel >= 0.0.20210128 BuildRequires: libmicrosoft-gsl-devel BuildRequires: tl-expected-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: librnnoise-devel Requires: kconfig +Requires: qt6-qtimageformats %description The official desktop client for the Telegram messenger. +%ifnarch aarch64 %{ix86} %debug_package +%endif %prep %setup -q -n tdesktop-%{version}-full +#-D -T +#:<< _EOF +#%patch4 -p1 +#cd Telegram/lib_webview +#%patch3 -p1 %build +#:<< __EOF %cmake -d build \ -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ -DTDESKTOP_API_ID=17349 \ -DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb \ -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ - -DDESKTOP_APP_SPECIAL_TARGET="" + -DDESKTOP_APP_SPECIAL_TARGET="" \ +%ifarch aarch64 %{ix86} + -DCMAKE_CXX_FLAGS="%{optflags} -Os -s -Wl,--gc-sections -Wl,--no-keep-memory -fPIC" +%endif -ninja %{_smp_mflags} +ninja -j2 %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -110,11 +127,17 @@ fi %{_bindir}/telegram-desktop %{_kde5_servicesdir}/tg.protocol %{_datadir}/applications/telegramdesktop.desktop -%{_datadir}/metainfo/telegramdesktop.appdata.xml +%{_datadir}/metainfo/telegramdesktop.metainfo.xml %{_datadir}/icons/hicolor/*/apps/telegram.png %doc LICENSE LEGAL %changelog +* Tue Jan 04 2022 Automatic Build System 3.4.3-1mamba +- automatic version update by autodist + +* Sun Jan 02 2022 Automatic Build System 3.4.2-1mamba +- automatic version update by autodist + * Sat Feb 27 2021 Automatic Build System 2.6.1-1mamba - automatic version update by autodist