From b1df562cddfa663503ff884ba27502e96145d1753648bcdacef09df63461b530 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 6 Dec 2022 10:23:28 +0000 Subject: [PATCH] - U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch * needed by plasma5-workspace OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libICE?expand=0&rev=21 --- ...eroperability-error-due-to-static_as.patch | 32 +++++++++++++++++++ libICE.changes | 6 ++++ libICE.spec | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch diff --git a/U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch b/U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch new file mode 100644 index 0000000..00994b8 --- /dev/null +++ b/U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch @@ -0,0 +1,32 @@ +From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +Date: Sun, 4 Dec 2022 22:19:20 +0100 +Subject: [PATCH] ICEmsg: Fix C++ interoperability error due to static_assert + define + +Commit 0269c687e954db7aca2a4344e32cb203315a00b6 added a static_assert helper +that gets defined to blank if left undefined by assert.h. As this is not a +macro in other languages that use this header, this can lead to a compile-time +error. + +Bug: https://bugs.gentoo.org/884369 +--- + include/X11/ICE/ICEmsg.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h +index b6bad13..13e1509 100644 +--- a/include/X11/ICE/ICEmsg.h ++++ b/include/X11/ICE/ICEmsg.h +@@ -34,7 +34,7 @@ Author: Ralph Mor, X Consortium + #include + + #include +-#ifndef static_assert ++#if !defined(__cplusplus) && !defined(static_assert) + #define static_assert(cond, msg) /* skip for non-C11 compilers */ + #endif + +-- +2.35.3 + diff --git a/libICE.changes b/libICE.changes index 72be359..67a13f4 100644 --- a/libICE.changes +++ b/libICE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 6 10:20:56 UTC 2022 - Stefan Dirsch + +- U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch + * needed by plasma5-workspace + ------------------------------------------------------------------- Sun Dec 4 22:56:03 UTC 2022 - Stefan Dirsch diff --git a/libICE.spec b/libICE.spec index 2362fad..0f76687 100644 --- a/libICE.spec +++ b/libICE.spec @@ -29,6 +29,7 @@ URL: http://xorg.freedesktop.org/ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libICE/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz Source1: baselibs.conf +Patch0: U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: autoconf @@ -80,6 +81,7 @@ in %lname. %prep %setup -q +%patch0 -p1 %build autoreconf -fi