1
0

Accepting request 678082 from server:messaging

OBS-URL: https://build.opensuse.org/request/show/678082
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/telegram-desktop?expand=0&rev=9
This commit is contained in:
Stephan Kulow 2019-02-24 16:19:55 +00:00 committed by Git OBS Bridge
commit 55b8ec011b
3 changed files with 27 additions and 0 deletions

13
gcc7-fix.patch Normal file
View File

@ -0,0 +1,13 @@
Index: tdesktop-1.5.15/Telegram/SourceFiles/boxes/add_contact_box.cpp
===================================================================
--- tdesktop-1.5.15.orig/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ tdesktop-1.5.15/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -97,7 +97,7 @@ void ShowAddParticipantsError(
channel,
user,
close,
- close);
+ [=] { close(0); });
auto box = Box<EditAdminBox>(
channel,
user,

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Feb 21 18:47:14 UTC 2019 - Marcel Kuehlhorn <tux93@opensuse.org>
- Do not apply gcc7-fix.patch on Tumbleweed
-------------------------------------------------------------------
Wed Feb 20 12:12:25 UTC 2019 - ramaxlo@gmail.com
- Fix build failure for openSUSE Leap 15.0.
-------------------------------------------------------------------
Tue Feb 12 18:54:25 UTC 2019 - Marcel Kuehlhorn <tux93@opensuse.org>

View File

@ -47,6 +47,7 @@ Source10: crl-master.zip
Source11: xxHash-master.zip
Patch0: tdesktop.patch
Patch1: gcc7-fix.patch
BuildRequires: chrpath
BuildRequires: cmake
BuildRequires: desktop-file-utils
@ -162,6 +163,9 @@ mv xxHash %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
cp %{_sourcedir}/tdesktop.patch %{_builddir}/tdesktop-%{version}
cd %{_builddir}/tdesktop-%{version}
%patch0 -p1
%if 0%{?sle_version} <= 150000 && 0%{?is_opensuse} && %{defined sle_version}
%patch1 -p1
%endif
cp %{_sourcedir}/patch.py . && python3 ./patch.py
cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/