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 deleted file mode 100644 index 00994b8..0000000 --- a/U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch +++ /dev/null @@ -1,32 +0,0 @@ -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.1.0.tar.xz b/libICE-1.1.0.tar.xz deleted file mode 100644 index de14708..0000000 --- a/libICE-1.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02d2fc40d81180bd4aae73e8356acfa2a7671e8e8b472e6a7bfa825235ab225b -size 335864 diff --git a/libICE-1.1.1.tar.xz b/libICE-1.1.1.tar.xz new file mode 100644 index 0000000..ee0fc54 --- /dev/null +++ b/libICE-1.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451 +size 335960 diff --git a/libICE.changes b/libICE.changes index 67a13f4..0b70672 100644 --- a/libICE.changes +++ b/libICE.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 8 20:57:53 UTC 2022 - Dirk Müller + +- update to 1.1.1: + * ICEmsg: Fix C++ interoperability error due to static_assert define +- drop U_ICEmsg-Fix-C-interoperability-error-due-to-static_as.patch (upstream) + ------------------------------------------------------------------- Tue Dec 6 10:20:56 UTC 2022 - Stefan Dirsch diff --git a/libICE.spec b/libICE.spec index 0f76687..f892a99 100644 --- a/libICE.spec +++ b/libICE.spec @@ -16,21 +16,18 @@ # -Name: libICE %define lname libICE6 -Version: 1.1.0 +Name: libICE +Version: 1.1.1 Release: 0 Summary: X11 Inter-Client Exchange Library License: MIT Group: Development/Libraries/C and C++ -URL: http://xorg.freedesktop.org/ - +URL: https://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.xz +Source: https://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 BuildRequires: automake @@ -49,14 +46,14 @@ framework for building such protocols, allowing them to make use of common negotiation mechanisms and to be multiplexed over a single transport connection. -%package -n %lname +%package -n %{lname} Summary: X11 Inter-Client Exchange Library # O/P added for 12.2 Group: System/Libraries -Provides: xorg-x11-libICE = 7.6_%version-%release -Obsoletes: xorg-x11-libICE < 7.6_%version-%release +Provides: xorg-x11-libICE = 7.6_%{version}-%{release} +Obsoletes: xorg-x11-libICE < 7.6_%{version}-%{release} -%description -n %lname +%description -n %{lname} The Inter-Client Exchange (ICE) protocol is intended to provide a framework for building such protocols, allowing them to make use of common negotiation mechanisms and to be multiplexed over a single @@ -65,10 +62,10 @@ transport connection. %package devel Summary: Development files for the X11 Inter-Client Exchange Library Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} # O/P added for 12.2 -Provides: xorg-x11-libICE-devel = 7.6_%version-%release -Obsoletes: xorg-x11-libICE-devel < 7.6_%version-%release +Provides: xorg-x11-libICE-devel = 7.6_%{version}-%{release} +Obsoletes: xorg-x11-libICE-devel < 7.6_%{version}-%{release} %description devel The Inter-Client Exchange (ICE) protocol is intended to provide a @@ -77,34 +74,31 @@ common negotiation mechanisms and to be multiplexed over a single transport connection. This package contains the development headers for the library found -in %lname. +in %{lname}. %prep %setup -q -%patch0 -p1 %build autoreconf -fi -%configure --docdir=%_docdir/%name --disable-static -make %{?_smp_mflags} +%configure --docdir=%{_docdir}/%{name} --disable-static +%make_build %install -make install DESTDIR="%buildroot" -rm -f "%buildroot/%_libdir"/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig - -%files -n %lname -%defattr(-,root,root) -%_libdir/libICE.so.6* +%files -n %{lname} +%license COPYING +%{_libdir}/libICE.so.6* %files devel -%defattr(-,root,root) -%_includedir/X11/* -%_libdir/libICE.so -%_libdir/pkgconfig/ice.pc -%_docdir/%name +%{_includedir}/X11/* +%{_libdir}/libICE.so +%{_libdir}/pkgconfig/ice.pc +%{_docdir}/%{name} %changelog