diff --git a/0000-gtk2-default.patch b/0000-gtk2-default.patch deleted file mode 100644 index c92cca0..0000000 --- a/0000-gtk2-default.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- tdesktop-2.5.6-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp.orig 2021-01-25 12:03:00.667137167 +0100 -+++ tdesktop-2.5.6-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp 2021-01-25 12:04:18.203759707 +0100 -@@ -317,12 +317,12 @@ void GtkIntegration::load() { - QLibrary lib_gtk; - lib_gtk.setLoadHints(QLibrary::DeepBindHint); - -- if (LoadLibrary(lib_gtk, "gtk-3", 0)) { -+ if (LoadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { - GtkLoaded = SetupGtkBase(lib_gtk); - } - if (!GtkLoaded - && !GtkTriedToInit -- && LoadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { -+ && LoadLibrary(lib_gtk, "gtk-3", 0)) { - GtkLoaded = SetupGtkBase(lib_gtk); - } - diff --git a/tdesktop-2.5.8-full.tar.gz b/tdesktop-2.5.8-full.tar.gz deleted file mode 100644 index 053c898..0000000 --- a/tdesktop-2.5.8-full.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c89cb31f8ba8a26821fe3c2769b04162e8d7629d327f9cd25a892e88878417e -size 36685925 diff --git a/tdesktop-2.7.1-full.tar.gz b/tdesktop-2.7.1-full.tar.gz new file mode 100644 index 0000000..8483974 --- /dev/null +++ b/tdesktop-2.7.1-full.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41bfbe1ee63da9a6af7cf7d11b1cdd13a6754b51b294ac5a9d56f5f11dfbdd05 +size 36770178 diff --git a/telegram-desktop-cinttypes-header.patch b/telegram-desktop-cinttypes-header.patch new file mode 100644 index 0000000..39ff57e --- /dev/null +++ b/telegram-desktop-cinttypes-header.patch @@ -0,0 +1,12 @@ +Index: tdesktop-2.7.1-full/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.h +=================================================================== +--- tdesktop-2.7.1-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.h ++++ tdesktop-2.7.1-full/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.h +@@ -2,6 +2,7 @@ + #define TGCALLS_STREAMING_PART_H + + #include "absl/types/optional.h" ++#include + #include + + namespace tgcalls { diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 7b56f43..cbf5e46 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,8 +1,104 @@ +------------------------------------------------------------------- +Tue Mar 23 13:14:33 UTC 2021 - Jan Engelhardt + +- Expand the ExcludeArch. + +------------------------------------------------------------------- +Mon Mar 22 16:07:33 UTC 2021 - Marcel Kuehlhorn + +- Exclude i586, support was dropped upstream + (gh#telegramdesktop/tdesktop#10037) + +------------------------------------------------------------------- +Mon Mar 22 12:50:48 UTC 2021 - Atri Bhattacharya + +- Add telegram-desktop-cinttypes-header.patch: Include cinttypes + header to use uint32_t. +- Add xkbcommon and wayland header dirs to CXXFLAGS to fix build + failures. +- Require Qt >= 5.15: Required since version 2.5.9 + (gh#telegramdesktop/tdesktop#10398). +- Pass -q to unzip to avoid echoing long file list while + unzipping. + +------------------------------------------------------------------- +Mon Mar 22 10:23:27 UTC 2021 - Marcel Kuehlhorn + +- Update to 2.7.1 + * Fix editing 'Manage Voice Chats' rights for channel admins. + * Fix verification check display in voice chat participants list. + * Allow removing and blocking channels from voice chats. +- Update tg_owt + +------------------------------------------------------------------- +Sat Mar 20 16:16:34 UTC 2021 - Marcel Kuehlhorn + +- Update to 2.7.0 + * Start limitless Voice Chats in Groups and Channels. + * Host discussions that can be listened to by millions of people + simultaneously. + * Record voice chats to share or publish in Channels later. + * See that a chat is being recorded from the red dot next to + its title. + * See user bio texts right from the list of participants. + * Raise your hand to show admins you want to speak. + * Create separate Voice Chat Invite Links for listeners or speakers. + * Change the title of your Voice Chat to give people an idea + of the current topic. + * Join Voice Chats as one of your Channels to hide your + personal account. + ------------------------------------------------------------------- Thu Mar 18 12:46:03 UTC 2021 - Martin Liška - Use higher dwz memory limits for the package. +------------------------------------------------------------------- +Sat Mar 13 19:10:27 UTC 2021 - Marcel Kuehlhorn + +- Update to 2.6.2 + * Fix text disappearing because of cloud drafts sync. + +------------------------------------------------------------------- +Wed Feb 24 20:00:09 UTC 2021 - Marcel Kuehlhorn + +- Update to 2.6.1 + * Fix time formatting in links. + * Fix copy QR code in night mode. + * Fix invite link sharing without a comment. + * Fix crash in link editing on Linux. + +------------------------------------------------------------------- +Wed Feb 23 22:42:33 UTC 2021 - Marcel Kuehlhorn + +- Update to 2.6.0 + * Set messages to auto-delete for everyone 24 hours or 7 days + after sending. + * Control auto-delete settings in any of your chats, as well as + in groups and channels where you are an admin. + * To enable auto-delete, right click on the chat in the + chat list > Clear History > Enable Auto-Delete. + * Create invite links that work for a limited time or a limited + number of uses. + * See which users joined using your, or your admins', invite links. + * Turn any invite link into a QR code users can scan with their + phone cameras. + * To manage invite links, click ... > Manage Group/Channel + > Invite Links. + * Convert groups that have reached 200,000 members into unlimited + Broadcast Groups. +- Remove 0000-gtk2-default.patch, the code was removed upstream, + meaning GTK integration is again broken, see boo#1149986 + +------------------------------------------------------------------- +Wed Feb 17 19:52:07 UTC 2021 - Marcel Kuehlhorn + +- Update to 2.5.9 + * Add 'Invite via Link' button to Add Members box. + * Fix window size in Windows 10 Tablet Mode. + * Fix layout of round video messages in channels. +- Update tg_owt + ------------------------------------------------------------------- Sun Jan 31 14:57:11 UTC 2021 - Marcel Kuehlhorn @@ -30,7 +126,7 @@ Mon Jan 25 11:06:07 UTC 2021 - Marcel Kuehlhorn * Add more information to date tooltips in Recent Actions and channel comments. * Bug andicrash fixes. -- Updatet tg_owt +- Update tg_owt - Rebase 0000-gtk2-default.patch ------------------------------------------------------------------- diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 79750bc..9ab615c 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -34,7 +34,7 @@ %define _dwz_max_die_limit 200000000 Name: telegram-desktop -Version: 2.5.8 +Version: 2.7.1 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only @@ -44,11 +44,16 @@ Source0: https://github.com/telegramdesktop/tdesktop/releases/download/v% # git clone --recurse-submodules https://github.com/desktop-app/tg_owt.git tg_owt-master Source1: tg_owt-master.zip # PATCH-FIX-OPENSUSE -Patch0: 0000-gtk2-default.patch -# PATCH-FIX-OPENSUSE Patch1: 0001-use-bundled-ranged-exptected-gsl.patch # PATCH-FIX-OPENSUSE Patch2: 0002-tg_owt-fix-name-confliction.patch +# PATCH-FIX-UPSTREAM telegram-desktop-cinttypes-header.patch badshah400@gmail.com -- Include cinttypes to allow uint32_t usage +Patch3: telegram-desktop-cinttypes-header.patch +# There is an (incomplete) patch available for part of the source: +# https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4 +# but tdesktop itself still falls short, and it looks to be something +# that would affect all ILP32 platforms. +ExcludeArch: %ix86 %arm aarch64_ilp32 ppc riscv32 BuildRequires: appstream-glib BuildRequires: chrpath BuildRequires: cmake >= 3.16 @@ -62,13 +67,13 @@ BuildRequires: gcc9-c++ BuildRequires: gcc-c++ %endif BuildRequires: glibc-devel -BuildRequires: libQt5Core-private-headers-devel -BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libQt5Core-private-headers-devel >= 5.15 +BuildRequires: libQt5Gui-private-headers-devel >= 5.15 BuildRequires: libjpeg-devel BuildRequires: liblz4-devel -BuildRequires: libqt5-qtbase-common-devel -BuildRequires: libqt5-qtimageformats-devel -BuildRequires: libqt5-qtwayland-private-headers-devel +BuildRequires: libqt5-qtbase-common-devel >= 5.15 +BuildRequires: libqt5-qtimageformats-devel >= 5.15 +BuildRequires: libqt5-qtwayland-private-headers-devel >= 5.15 BuildRequires: libwebrtc_audio_processing-devel BuildRequires: ninja BuildRequires: pkgconfig @@ -78,16 +83,17 @@ BuildRequires: xxhash-devel BuildRequires: xz BuildRequires: yasm BuildRequires: cmake(KF5Wayland) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5WaylandClient) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5DBus) >= 5.15 +BuildRequires: pkgconfig(Qt5Network) >= 5.15 +BuildRequires: pkgconfig(Qt5WaylandClient) >= 5.15 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.15 BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glibmm-2.4) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(harfbuzz) @@ -152,11 +158,11 @@ The service also provides APIs to independent developers. %prep %setup -q -n tdesktop-%{version}-full -%patch0 -p1 %patch1 -p2 +%patch3 -p1 cd ../ -unzip %{S:1} +unzip -q %{S:1} mkdir Libraries mv tg_owt-master Libraries/tg_owt %patch2 -p2 -d Libraries/tg_owt @@ -167,6 +173,9 @@ export CC=/usr/bin/gcc-9 export CXX=/usr/bin/g++-9 %endif +# Fix build failures due to not finding installed headers for xkbcommon and wayland-client +export CXXFLAGS+="`pkg-config --cflags xkbcommon wayland-client`" + cd %{_builddir}/Libraries/tg_owt mkdir -p out/Release cd out/Release @@ -196,7 +205,8 @@ cd %{_builddir}/tdesktop-%{version}-full -DDESKTOP_APP_USE_PACKAGED_FONTS=ON \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DTDESKTOP_LAUNCHER_BASENAME=%{name} \ - -DDESKTOP_APP_SPECIAL_TARGET="" + -DDESKTOP_APP_SPECIAL_TARGET="" \ + -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=ON %cmake_build diff --git a/tg_owt-master.zip b/tg_owt-master.zip index 283bc5e..8c718af 100644 --- a/tg_owt-master.zip +++ b/tg_owt-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b86f446d62c4c95b5dac47f13d4f3c90c633a1aa56bcb7a7003f18accc29eb51 -size 29050228 +oid sha256:ff422aa189bdc3d2cd6a435c205820a8062dcfd6fd46311d7f85217c48607964 +size 28724461