diff --git a/libX11-1.7.3.1.tar.xz b/libX11-1.7.3.1.tar.xz deleted file mode 100644 index 0253a02..0000000 --- a/libX11-1.7.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 -size 1864224 diff --git a/libX11-1.7.5.tar.xz b/libX11-1.7.5.tar.xz new file mode 100644 index 0000000..42be42f --- /dev/null +++ b/libX11-1.7.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151 +size 1853152 diff --git a/libX11.changes b/libX11.changes index ffdbe36..4a08eb5 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Apr 3 18:37:48 UTC 2022 - Stefan Dirsch + +- Update to version 1.7.4 + * Don't try to destroy NULL condition variables + +------------------------------------------------------------------- +Thu Mar 31 08:53:37 UTC 2022 - Stefan Dirsch + +- Update to version 1.7.4 + * bugfix release +- supersedes p_khmer-compose.diff + ------------------------------------------------------------------- Fri Dec 10 10:04:50 UTC 2021 - Stefan Dirsch diff --git a/libX11.spec b/libX11.spec index b31c586..2dab0ed 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,7 +1,7 @@ # # spec file for package libX11 # -# Copyright (c) 2021 SUSE LLC +# 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 @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.7.3.1 +Version: 1.7.5 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -27,8 +27,6 @@ URL: http://xorg.freedesktop.org/ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/ Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer -Patch0: p_khmer-compose.diff # PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables Patch1: p_xlib_skip_ext_env.diff # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales @@ -135,7 +133,6 @@ in libX11-6 and libX11-xcb1. test -f nls/ja.U90/XLC_LOCALE.pre && exit 1 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 -%patch0 %patch1 %patch2 %patch3 -p1 diff --git a/p_khmer-compose.diff b/p_khmer-compose.diff deleted file mode 100644 index de4b3e3..0000000 --- a/p_khmer-compose.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: nls/compose.dir.pre -=================================================================== ---- nls/compose.dir.pre.orig -+++ nls/compose.dir.pre -@@ -171,6 +171,7 @@ georgian-academy/Compose: ka_GE.GEORGIAN - georgian-ps/Compose: ka_GE.GEORGIAN-PS - iso8859-1/Compose: kl_GL.ISO8859-1 - iso8859-15/Compose: kl_GL.ISO8859-15 -+en_US.UTF-8/Compose: km_KH.UTF-8 - iso8859-1/Compose: kw_GB.ISO8859-1 - iso8859-14/Compose: kw_GB.ISO8859-14 - iso8859-15/Compose: kw_GB.ISO8859-15