Accepting request 1072175 from X11:XOrg

- Update to version 1.8.4
  This release fixes the regressions in previous 1.8.x related to the thread-
  -safety-constructor option. (boo#1209176)
- supersedes U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch

OBS-URL: https://build.opensuse.org/request/show/1072175
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libX11?expand=0&rev=46

U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch

@@ -1,53 +0,0 @@
-From 1d11822601fd24a396b354fa616b04ed3df8b4ef Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <dickey@invisible-island.net>
-Date: Tue, 4 Oct 2022 18:26:17 -0400
-Subject: [PATCH] fix a memory leak in XRegisterIMInstantiateCallback
-
-Analysis:
-
-    _XimRegisterIMInstantiateCallback() opens an XIM and closes it using
-    the internal function pointers, but the internal close function does
-    not free the pointer to the XIM (this would be done in XCloseIM()).
-
-Report/patch:
-
-    Date: Mon, 03 Oct 2022 18:47:32 +0800
-    From: Po Lu <luangruo@yahoo.com>
-    To: xorg-devel@lists.x.org
-    Subject: Re: Yet another leak in Xlib
-
-    For reference, here's how I'm calling XRegisterIMInstantiateCallback:
-
-    XSetLocaleModifiers ("");
-    XRegisterIMInstantiateCallback (compositor.display,
-                                    XrmGetDatabase (compositor.display),
-                                    (char *) compositor.resource_name,
-                                    (char *) compositor.app_name,
-                                    IMInstantiateCallback, NULL);
-
-    and XMODIFIERS is:
-
-        @im=ibus
-
-Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
----
- modules/im/ximcp/imInsClbk.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
-index 95b379cb..c10e347f 100644
---- a/modules/im/ximcp/imInsClbk.c
-+++ b/modules/im/ximcp/imInsClbk.c
-@@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback(
-     if( xim ) {
- 	lock = True;
- 	xim->methods->close( (XIM)xim );
-+	/* XIMs must be freed manually after being opened; close just
-+	   does the protocol to deinitialize the IM.  */
-+	XFree( xim );
- 	lock = False;
- 	icb->call = True;
- 	callback( display, client_data, NULL );
--- 
-2.35.3
-

libX11-1.8.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7
-size 1818460

libX11-1.8.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518
+size 1835316

libX11.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar  9 11:58:32 UTC 2023 - llyyr <llyyr.public@gmail.com>
+
+- Update to version 1.8.4
+  This release fixes the regressions in previous 1.8.x related to the thread-
+  -safety-constructor option. (boo#1209176)
+- supersedes U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch
+
 -------------------------------------------------------------------
 Mon Dec  5 20:33:29 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 

libX11.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libX11
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 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.1
+Version:        1.8.4
 Release:        0
 Summary:        Core X11 protocol client library
 License:        MIT
@@ -32,7 +32,6 @@ Patch1:         p_xlib_skip_ext_env.diff
 # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales
 Patch2:         en-locales.diff
 Patch3:         u_no-longer-crash-in-XVisualIDFromVisual.patch
-Patch4:         U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch
 BuildRequires:  fdupes
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -136,7 +135,6 @@ test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
 %patch1
 %patch2
 %patch3 -p1
-%patch4 -p1
 
 %build
 %configure \