rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 980590 from home:marec2000:branches:server:messaging

Browse Source 
- fix for leap 15.4
- additionally request #980589 is needed for telegram to build on 15.4

OBS-URL: https://build.opensuse.org/request/show/980590
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=224
This commit is contained in:
Marcel Kuehlhorn 2022-06-06 19:34:58 +00:00 committed by Git OBS Bridge
parent e75f8677d3
commit a71148f935
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
telegram-desktop.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 3 08:08:46 UTC 2022 - marec <marec@detebe.org>
- fix for leap 15.4
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 10 19:07:11 UTC 2022 - Илья Индиго <ilya@ilya.cf> Tue May 10 19:07:11 UTC 2022 - Илья Индиго <ilya@ilya.cf>

16
telegram-desktop.spec
View File

@ -23,6 +23,13 @@
%define __builder ninja %define __builder ninja
# gcc10 or higher is required
%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150400 ) )
%bcond_without compiler_upgrade
%else
%bcond_with compiler_upgrade
%endif
%define _dwz_low_mem_die_limit 40000000 %define _dwz_low_mem_die_limit 40000000
%define _dwz_max_die_limit 200000000 %define _dwz_max_die_limit 200000000
@ -63,6 +70,11 @@ BuildRequires: desktop-file-utils
BuildRequires: enchant-devel BuildRequires: enchant-devel
BuildRequires: ffmpeg-devel BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
%if %{with compiler_upgrade}
BuildRequires: gcc10-c++
%else
BuildRequires: gcc-c++
%endif
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: liblz4-devel BuildRequires: liblz4-devel
@ -177,6 +189,10 @@ mv tg_owt-master Libraries/tg_owt
%patch2 -p2 -d Libraries/tg_owt %patch2 -p2 -d Libraries/tg_owt
%build %build
%if %{with compiler_upgrade}
export CC=gcc-10
export CXX=g++-10
%endif
# Fix build failures due to not finding installed headers for xkbcommon and wayland-client # Fix build failures due to not finding installed headers for xkbcommon and wayland-client
export CXXFLAGS+="`pkg-config --cflags xkbcommon wayland-client`" export CXXFLAGS+="`pkg-config --cflags xkbcommon wayland-client`"