From 1efbd2de70c99389217bb502ef3d9e727c21f75aadefff672b9625ef27fb86aa Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Fri, 14 Apr 2023 10:22:45 +0000 Subject: [PATCH] Accepting request 1079423 from home:manfred-h:server:messaging - Commit 0d37d47eca896005eb0a645e0db461f4dafb317b breaks building with glibmm < 2.76; use DESKTOP_APP_DISABLE_DBUS_INTEGRATION on Leap 15.4 and 15.5 to work around it. OBS-URL: https://build.opensuse.org/request/show/1079423 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=254 --- telegram-desktop.changes | 7 +++++++ telegram-desktop.spec | 3 +++ 2 files changed, 10 insertions(+) diff --git a/telegram-desktop.changes b/telegram-desktop.changes index cb6c5a3..12eead3 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 14 07:13:24 UTC 2023 - Manfred Hollstein + +- Commit 0d37d47eca896005eb0a645e0db461f4dafb317b breaks building + with glibmm < 2.76; use DESKTOP_APP_DISABLE_DBUS_INTEGRATION + on Leap 15.4 and 15.5 to work around it. + ------------------------------------------------------------------- Mon Apr 10 01:58:12 UTC 2023 - Xu Zhao diff --git a/telegram-desktop.spec b/telegram-desktop.spec index d1afbe0..93fbe22 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -286,6 +286,9 @@ cd %{_builddir}/tdesktop-%{version}-full -DDESKTOP_APP_QT6=OFF \ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \ -DDESKTOP_APP_USE_ENCHANT=ON \ +%endif +%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150500 ) ) + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \ %endif -DTDESKTOP_API_ID=611335 \ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \