forked from pool/libICE
- 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
This commit is contained in:
parent
11c5e207e7
commit
b1df562cdd
32
U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch
Normal file
32
U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
|
||||||
|
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 <X11/ICE/ICEconn.h>
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
-#ifndef static_assert
|
||||||
|
+#if !defined(__cplusplus) && !defined(static_assert)
|
||||||
|
#define static_assert(cond, msg) /* skip for non-C11 compilers */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--
|
||||||
|
2.35.3
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 6 10:20:56 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
- 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 <sndirsch@suse.com>
|
Sun Dec 4 22:56:03 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@ URL: http://xorg.freedesktop.org/
|
|||||||
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libICE/
|
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libICE/
|
||||||
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
|
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
|
Patch0: U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
#git#BuildRequires: autoconf >= 2.60, automake, libtool
|
#git#BuildRequires: autoconf >= 2.60, automake, libtool
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -80,6 +81,7 @@ in %lname.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user