1
0

Accepting request 678049 from home:ramax:branches:server:messaging

- Fix build failure for openSUSE Leap 15.0.
  This version of telegram is no longer buildable for Leap 42.3
  due to the lack of c++17 support in gcc 4.8.

OBS-URL: https://build.opensuse.org/request/show/678049
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=68
This commit is contained in:
Marcel Kuehlhorn 2019-02-21 18:34:25 +00:00 committed by Git OBS Bridge
parent 61905a8820
commit 6cf1cec30a
3 changed files with 23 additions and 1 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,8 @@
-------------------------------------------------------------------
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

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -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}
%patch1 -p1
%endif
cp %{_sourcedir}/patch.py . && python3 ./patch.py
cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/