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-1.0.10.tar.bz2 b/libICE-1.0.10.tar.bz2 deleted file mode 100644 index aa89dd5..0000000 --- a/libICE-1.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348 -size 393116 diff --git a/libICE-1.1.0.tar.xz b/libICE-1.1.0.tar.xz new file mode 100644 index 0000000..de14708 --- /dev/null +++ b/libICE-1.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02d2fc40d81180bd4aae73e8356acfa2a7671e8e8b472e6a7bfa825235ab225b +size 335864 diff --git a/libICE.changes b/libICE.changes index bb2c5ec..67a13f4 100644 --- a/libICE.changes +++ b/libICE.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +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 + +- Update to version 1.1.0 + * Fix spelling/wording issues + * gitlab CI: add a basic build test + * configure: check for libbsd before libxtrans checks for strlcpy + * ConnectToPeer: be doubly sure that use-after-free doesn't happen + * ProcessAuthReply: rename status variable to avoid shadowing + * Only link to libbsd for arc4random_buf if it is not found in libc + * IceGetHeaderExtra: only include extra space in outbufptr if there's room + * Refactor Fatal I/O error handling into a common function + * IceFlush: signal fatal I/O error if bufptr is past end of buffer + * ICEmsg.h: Add static asserts that message header length <= ICE_OUTBUFSIZE + * Handle arrays too large to fit in iceConn buffers + * Only link with libbsd if needed for arc4random_buf() or getentropy() + * Avoid -Wdeclaration-after-statement warnings from static_assert + * ice.pc.in: "Libs.Private" should be "Libs.private" + * configure: Use AC_SYS_LARGEFILE to enable large file support + ------------------------------------------------------------------- Mon Jul 15 09:45:31 UTC 2019 - Stefan Dirsch diff --git a/libICE.spec b/libICE.spec index 7a005cc..0f76687 100644 --- a/libICE.spec +++ b/libICE.spec @@ -1,7 +1,7 @@ # # spec file for package libICE # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,18 @@ Name: libICE %define lname libICE6 -Version: 1.0.10 +Version: 1.1.0 Release: 0 Summary: X11 Inter-Client Exchange Library License: MIT Group: Development/Libraries/C and C++ -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.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.bz2 +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