commit: d8ad45581084906c0f9691a8fd14ea52bc92a59c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 16:12:59 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 16:13:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ad4558
x11-libs/libICE: Version bump to 1.1.1
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/libICE/Manifest | 2 +-
.../files/libICE-1.1.0-static-assert-fix.patch | 32 ----------------------
...{libICE-1.1.0-r1.ebuild => libICE-1.1.1.ebuild} | 4 ---
3 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index d53a82ff1f70..89dec44dd611 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,2 +1,2 @@
DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B
2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f
SHA512
2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-DIST libICE-1.1.0.tar.xz 335864 BLAKE2B
c18ae08d61632d6a495b479045cafadaabb556fc55d5107b8b6c323cc7523a153d083a89016e2a84aa810735c542ba7bac7fa70620036b74125f65bdf920c40d
SHA512
bf8ca11a20bc120337003a8ef1c190e26e3650dede653287aae7893abd8c72191401d90ddc4bb9b367ae832eee23a22d02b0d4a3b9071c392f865379034b2838
+DIST libICE-1.1.1.tar.xz 335960 BLAKE2B
2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae
SHA512
2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3
diff --git a/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
b/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
deleted file mode 100644
index 5d6d4bbc441d..000000000000
--- a/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]>
-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
-
---
-GitLab
-
diff --git a/x11-libs/libICE/libICE-1.1.0-r1.ebuild
b/x11-libs/libICE/libICE-1.1.1.ebuild
similarity index 91%
rename from x11-libs/libICE/libICE-1.1.0-r1.ebuild
rename to x11-libs/libICE/libICE-1.1.1.ebuild
index 1d54eb6c66d3..4166e1d11bec 100644
--- a/x11-libs/libICE/libICE-1.1.0-r1.ebuild
+++ b/x11-libs/libICE/libICE-1.1.1.ebuild
@@ -18,10 +18,6 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.0-static-assert-fix.patch"
-)
-
XORG_CONFIGURE_OPTIONS=(
--enable-ipv6
--disable-docs
