From 51396856aeed0f75b334661fe97adcfb1b81118d83c827e829350aeddc11f252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 17:23:23 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libX11 revision aa3ce666b0a5bb245a4544a7e2967841 --- libX11-1.8.10.tar.xz | 3 ++ libX11-1.8.7.tar.xz | 3 -- libX11.changes | 55 +++++++++++++++++++++++++++++++++ libX11.spec | 72 ++++++++++++++++++-------------------------- 4 files changed, 87 insertions(+), 46 deletions(-) create mode 100644 libX11-1.8.10.tar.xz delete mode 100644 libX11-1.8.7.tar.xz diff --git a/libX11-1.8.10.tar.xz b/libX11-1.8.10.tar.xz new file mode 100644 index 0000000..5309960 --- /dev/null +++ b/libX11-1.8.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b3b3dad9347db41dca56beb7db5878f283bde1142f04d9f8e478af435dfdc53 +size 1839380 diff --git a/libX11-1.8.7.tar.xz b/libX11-1.8.7.tar.xz deleted file mode 100644 index 23259aa..0000000 --- a/libX11-1.8.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05f267468e3c851ae2b5c830bcf74251a90f63f04dd7c709ca94dc155b7e99ee -size 1859256 diff --git a/libX11.changes b/libX11.changes index d653602..b95d41f 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Tue Jul 30 13:14:34 UTC 2024 - Stefan Dirsch + +- Update to 1.8.10; this release includes: + * Re-fix XIM input sometimes jumbled (#205, #206, #207, #208, !246) + * Fix various static analysis errors (!250) + * Add compose sequences for Arabic hamza (!218), Ezh (!221), and + hryvnia currency (!259) + * Make colormap private interfaces thread safe (#215, !254) + * Fix deadlock in XRebindKeysym() (!256) + * Assorted memory handling cleanups (!251, !258) + * Restore VAX support still in use by NetBSD (!257) + +------------------------------------------------------------------- +Sat Apr 6 03:06:49 UTC 2024 - Stefan Dirsch + +- Update to 1.8.9 + * Fix regressions introduced in 1.8.8 (!245, !248) - this includes + reverting for now the previous "Fix XIM input sometimes jumbled + (#198, !236)" +- supersedes + * U_0001-xlibi18n-restore-parse_line1-for-WIN32-builds.patch + * U_0002-Revert-imDefLkup-Commit-first-info-in-XimCommitInfo.patch + * U_0003-Revert-ximcp-Unmark-to-fabricate-key-events-with-XKe.patch + +------------------------------------------------------------------- +Fri Apr 5 10:42:25 UTC 2024 - Stefan Dirsch + +- U_0001-xlibi18n-restore-parse_line1-for-WIN32-builds.patch + U_0002-Revert-imDefLkup-Commit-first-info-in-XimCommitInfo.patch + U_0003-Revert-ximcp-Unmark-to-fabricate-key-events-with-XKe.patch + * fix regressions in 1.8.8 (issues #204, #205, #206, #207, #208) + +------------------------------------------------------------------- +Mon Mar 25 01:45:51 UTC 2024 - Stefan Dirsch + +- update to 1.8.8 + * Fix XIM input sometimes jumbled (#198, !236) + * Fix _XkbReadGetDeviceInfoReply for nButtons == dev->buttons (!237) + * Drop ifdefs for platforms that are no longer supported (!242, !243) + * Assorted memory handling cleanups + +------------------------------------------------------------------- +Fri Mar 1 17:52:11 UTC 2024 - Jan Engelhardt + +- Trim descriptions for size (keep the big one for the prominently + installed libX11-6). +- Spin documentation off to libX11-devel-doc, this saves buildroots + 800+ files and time (mandb is run in %posttrans). + +------------------------------------------------------------------- +Fri Mar 1 10:26:37 UTC 2024 - pgajdos@suse.com + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Nov 20 15:55:51 UTC 2023 - Stefan Dirsch diff --git a/libX11.spec b/libX11.spec index 177c85f..89fdc7c 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,7 +1,7 @@ # # spec file for package libX11 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.8.7 +Version: 1.8.10 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -45,13 +45,8 @@ BuildRequires: pkgconfig(xproto) >= 7.0.13 BuildRequires: pkgconfig(xtrans) %description -The X Window System is a network-transparent window system that was -designed at MIT. X display servers run on computers with either -monochrome or color bitmap display hardware. The server distributes -user input to and accepts output requests from various client -programs located either on the same machine or elsewhere in the -network. Xlib is a C subroutine library that application programs -(clients) use to interface with the window system by means of a +Xlib is a C subroutine library that application programs +(clients) use to interface with the X window system by means of a stream connection. %package -n libX11-6 @@ -78,14 +73,9 @@ Group: System/Libraries Requires: %{name}-data >= %{version} %description -n libX11-xcb1 -The X Window System is a network-transparent window system that was -designed at MIT. X display servers run on computers with either -monochrome or color bitmap display hardware. The server distributes -user input to and accepts output requests from various client -programs located either on the same machine or elsewhere in the -network. Xlib is a C subroutine library that application programs -(clients) use to interface with the window system by means of a -stream connection. +libX11-xcb provides functions needed by clients which take advantage +of Xlib/XCB to mix calls to both Xlib and XCB over the same X +connection. %package data Summary: Shared data for the Core X11 protocol library @@ -93,14 +83,11 @@ Group: System/Libraries BuildArch: noarch %description data -The X Window System is a network-transparent window system that was -designed at MIT. X display servers run on computers with either -monochrome or color bitmap display hardware. The server distributes -user input to and accepts output requests from various client -programs located either on the same machine or elsewhere in the -network. Xlib is a C subroutine library that application programs -(clients) use to interface with the window system by means of a -stream connection. +Data files for X11: + +* Error strings for X error codes +* Device-independent color name database +* Locale data and tables for the Compose Key %package devel Summary: Development files for the Core X11 protocol library @@ -114,34 +101,33 @@ Conflicts: xorgproto-devel < 2019.2 Provides: xorgproto-devel:%{_includedir}/X11/extensions/XKBgeom.h %description devel -The X Window System is a network-transparent window system that was -designed at MIT. X display servers run on computers with either -monochrome or color bitmap display hardware. The server distributes -user input to and accepts output requests from various client -programs located either on the same machine or elsewhere in the -network. Xlib is a C subroutine library that application programs -(clients) use to interface with the window system by means of a -stream connection. - This package contains the development headers for the library found in libX11-6 and libX11-xcb1. +%package devel-doc +Summary: Manual pages for libX11 +Group: Documentation/Man +BuildArch: noarch + +%description devel-doc +Manual pages for the C API of libX11. + %prep %setup -q # make legal department happy (Bug #153744) test -f nls/ja.U90/XLC_LOCALE.pre && exit 1 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 -%patch1 -%patch2 -%patch3 -p1 +%patch -P 1 +%patch -P 2 +%patch -P 3 -p1 %build %configure \ --disable-silent-rules \ --docdir=%{_docdir}/%{name} \ --disable-static -make %{?_smp_mflags} +%make_build %install %make_install @@ -163,10 +149,8 @@ popd %fdupes %{buildroot}/%{_mandir} -%post -n libX11-6 -p /sbin/ldconfig -%postun -n libX11-6 -p /sbin/ldconfig -%post -n libX11-xcb1 -p /sbin/ldconfig -%postun -n libX11-xcb1 -p /sbin/ldconfig +%ldconfig_scriptlets -n libX11-6 +%ldconfig_scriptlets -n libX11-xcb1 %files -n libX11-6 %{_libdir}/libX11.so.6* @@ -181,7 +165,9 @@ popd %{_includedir}/X11/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_docdir}/%{name} + +%files devel-doc %{_mandir}/man?/* +%{_docdir}/%{name} %changelog