From 9c6c29522b863ced22a284dbd1b50dd7fd8f9f81a6efc7e27383aa92810a4a49 Mon Sep 17 00:00:00 2001
From: Marcel Kuehlhorn <tux93@opensuse.org>
Date: Thu, 23 Mar 2023 20:21:19 +0000
Subject: [PATCH 1/2] Accepting request 1072572 from
home:manfred-h:server:messaging
- compiler_upgrade is also needed on Leap 15.5
OBS-URL: https://build.opensuse.org/request/show/1072572
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=250
---
telegram-desktop.changes | 5 +++++
telegram-desktop.spec | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/telegram-desktop.changes b/telegram-desktop.changes
index 477eb65..b8768ca 100644
--- a/telegram-desktop.changes
+++ b/telegram-desktop.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 17 09:57:44 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
+
+- compiler_upgrade is also needed on Leap 15.5
+
-------------------------------------------------------------------
Tue Feb 28 07:18:52 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index fe25546..0730faf 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -24,7 +24,7 @@
%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 ) )
+%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150500 ) )
%bcond_without compiler_upgrade
%else
%bcond_with compiler_upgrade
From adadabcfae8bd6b6397cda3ea374742de8619f90a0333ef402353dcac36f99b1 Mon Sep 17 00:00:00 2001
From: Marcel Kuehlhorn <tux93@opensuse.org>
Date: Mon, 27 Mar 2023 20:20:40 +0000
Subject: [PATCH 2/2] Accepting request 1074325 from
home:manfred-h:server:messaging
- The new default compiler gcc13 on Tumbleweed is too new for
compiling tg_owt-master.zip; e.g. "uint8_t" is now defined in
<cstdint> which almost all source files don't include. Stick
with gcc12 on Tumbleweed for now and wait for an update of
tg_owt-master.zip
OBS-URL: https://build.opensuse.org/request/show/1074325
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=251
---
telegram-desktop.changes | 9 +++++++++
telegram-desktop.spec | 16 ++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/telegram-desktop.changes b/telegram-desktop.changes
index b8768ca..18fa800 100644
--- a/telegram-desktop.changes
+++ b/telegram-desktop.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Mar 25 11:06:57 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
+
+- The new default compiler gcc13 on Tumbleweed is too new for
+ compiling tg_owt-master.zip; e.g. "uint8_t" is now defined in
+ <cstdint> which almost all source files don't include. Stick
+ with gcc12 on Tumbleweed for now and wait for an update of
+ tg_owt-master.zip
+
-------------------------------------------------------------------
Fri Mar 17 09:57:44 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 0730faf..3a5a1a0 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -27,8 +27,13 @@
%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150500 ) )
%bcond_without compiler_upgrade
%else
+%if 0%{?suse_version} > 01500
+# gcc13 is too new on Tumbleweed
+%bcond_without compiler_downgrade
+%else
%bcond_with compiler_upgrade
%endif
+%endif
%define _dwz_low_mem_die_limit 40000000
%define _dwz_max_die_limit 200000000
@@ -75,10 +80,16 @@ BuildRequires: enchant-devel
BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel
%if %{with compiler_upgrade}
+BuildRequires: gcc10
BuildRequires: gcc10-c++
%else
+%if %{with compiler_downgrade}
+BuildRequires: gcc12
+BuildRequires: gcc12-c++
+%else
BuildRequires: gcc-c++
%endif
+%endif
BuildRequires: glibc-devel
BuildRequires: libjpeg-devel
BuildRequires: liblz4-devel
@@ -227,6 +238,11 @@ mv tg_owt-master Libraries/tg_owt
%if %{with compiler_upgrade}
export CC=gcc-10
export CXX=g++-10
+%else
+%if %{with compiler_downgrade}
+export CC=gcc-12
+export CXX=g++-12
+%endif
%endif
# Fix build failures due to not finding installed headers for xkbcommon and wayland-client