commit: 670d193d9c83a3136832031046cf86055e124482 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Mar 13 19:49:10 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Mar 13 20:07:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670d193d
x11-libs/libX11: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/libX11/Manifest | 3 - .../files/libX11-1.8.3-reentrancy-again.patch | 188 --------------------- .../files/libX11-1.8.3-revert-XPutBackEvent.patch | 57 ------- x11-libs/libX11/libX11-1.7.5.ebuild | 40 ----- x11-libs/libX11/libX11-1.8.1.ebuild | 44 ----- x11-libs/libX11/libX11-1.8.3-r1.ebuild | 49 ------ 6 files changed, 381 deletions(-) diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index b9e9e2f84070..37308f401e67 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,4 +1 @@ -DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347 -DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a -DIST libX11-1.8.3.tar.xz 1811712 BLAKE2B 0adc92c13ba4bdec5d927349ca8c02adbb851eb376f19aa5f39e13caddb36c089be227c1f2dc61b34f882aae794f2b46ae237345c12c8e897be8df01e9fb3ef2 SHA512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901c2054c309bce1f1b3eb690704193e18cd470f682c663090210b14a9498b9259b6acc0e902053e7ab0ca9df076 SHA512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e diff --git a/x11-libs/libX11/files/libX11-1.8.3-reentrancy-again.patch b/x11-libs/libX11/files/libX11-1.8.3-reentrancy-again.patch deleted file mode 100644 index 3ab9b6b1424c..000000000000 --- a/x11-libs/libX11/files/libX11-1.8.3-reentrancy-again.patch +++ /dev/null @@ -1,188 +0,0 @@ -https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/eb1c272ab5230d548077b9f59aca4b3457c3a8f8 - -From eb1c272ab5230d548077b9f59aca4b3457c3a8f8 Mon Sep 17 00:00:00 2001 -From: GaryOderNichts <[email protected]> -Date: Sat, 17 Dec 2022 16:28:40 +0100 -Subject: [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 - ---- a/include/X11/Xlibint.h -+++ b/include/X11/Xlibint.h -@@ -43,6 +43,10 @@ from The Open Group. - #include <X11/Xproto.h> /* to declare xEvent */ - #include <X11/XlibConf.h> /* for configured options like XTHREADS */ - -+#ifdef XTHREADS -+#include <X11/Xthreads.h> -+#endif -+ - /* The Xlib structs are full of implicit padding to properly align members. - We can't clean that up without breaking ABI, so tell clang not to bother - complaining about it. */ -@@ -207,7 +211,10 @@ struct _XDisplay - - XIOErrorExitHandler exit_handler; - void *exit_handler_data; -- CARD32 in_ifevent; -+ CARD32 in_ifevent; -+#ifdef XTHREADS -+ xthread_t ifevent_thread; -+#endif - }; - - #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n) ---- a/src/ChkIfEv.c -+++ b/src/ChkIfEv.c -@@ -49,8 +49,11 @@ Bool XCheckIfEvent ( - unsigned long qe_serial = 0; - int n; /* time through count */ - -- dpy->in_ifevent++; - LockDisplay(dpy); -+#ifdef XTHREADS -+ dpy->ifevent_thread = xthread_self(); -+#endif -+ dpy->in_ifevent++; - prev = NULL; - for (n = 3; --n >= 0;) { - for (qelt = prev ? prev->next : dpy->head; ---- a/src/IfEvent.c -+++ b/src/IfEvent.c -@@ -48,8 +48,11 @@ XIfEvent ( - register _XQEvent *qelt, *prev; - unsigned long qe_serial = 0; - -- dpy->in_ifevent++; - LockDisplay(dpy); -+#ifdef XTHREADS -+ dpy->ifevent_thread = xthread_self(); -+#endif -+ dpy->in_ifevent++; - prev = NULL; - while (1) { - for (qelt = prev ? prev->next : dpy->head; ---- a/src/PeekIfEv.c -+++ b/src/PeekIfEv.c -@@ -49,8 +49,11 @@ XPeekIfEvent ( - register _XQEvent *prev, *qelt; - unsigned long qe_serial = 0; - -- dpy->in_ifevent++; - LockDisplay(dpy); -+#ifdef XTHREADS -+ dpy->ifevent_thread = xthread_self(); -+#endif -+ dpy->in_ifevent++; - prev = NULL; - while (1) { - for (qelt = prev ? prev->next : dpy->head; ---- a/src/locking.c -+++ b/src/locking.c -@@ -240,7 +240,9 @@ static void _XUnlockDisplay( - if (lock_hist_loc >= LOCK_HIST_SIZE) - lock_hist_loc = 0; - #endif /* XTHREADS_WARN */ -- xmutex_unlock(dpy->lock->mutex); -+ -+ if (dpy->in_ifevent == 0 || !xthread_equal(dpy->ifevent_thread, xthread_self())) -+ xmutex_unlock(dpy->lock->mutex); - } - - -@@ -453,63 +455,24 @@ static void _XDisplayLockWait( - } - - static void _XLockDisplay( -- Display *dpy -- XTHREADS_FILE_LINE_ARGS -- ); -- --static void _XIfEventLockDisplay( - Display *dpy - XTHREADS_FILE_LINE_ARGS - ) - { -- /* assert(dpy->in_ifevent); */ --} -+ struct _XErrorThreadInfo *ti; - --static void _XInternalLockDisplay( -- Display *dpy, -- Bool wskip -- XTHREADS_FILE_LINE_ARGS -- ); -+ if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) -+ return; - --static void _XIfEventInternalLockDisplay( -- Display *dpy, -- Bool wskip -- XTHREADS_FILE_LINE_ARGS -- ) --{ -- /* assert(dpy->in_ifevent); */ --} -- --static void _XIfEventUnlockDisplay( -- Display *dpy -- XTHREADS_FILE_LINE_ARGS -- ) --{ -- if (dpy->in_ifevent == 0) { -- dpy->lock_fns->lock_display = _XLockDisplay; -- dpy->lock_fns->unlock_display = _XUnlockDisplay; -- dpy->lock->internal_lock_display = _XInternalLockDisplay; -- UnlockDisplay(dpy); -- } else -- return; --} -- --static void _XLockDisplay( -- Display *dpy -- XTHREADS_FILE_LINE_ARGS -- ) --{ --#ifdef XTHREADS -- struct _XErrorThreadInfo *ti; --#endif - #ifdef XTHREADS_WARN - _XLockDisplayWarn(dpy, file, line); - #else - xmutex_lock(dpy->lock->mutex); - #endif -+ - if (dpy->lock->locking_level > 0) -- _XDisplayLockWait(dpy); --#ifdef XTHREADS -+ _XDisplayLockWait(dpy); -+ - /* - * Skip the two function calls below which may generate requests - * when LockDisplay is called from within _XError. -@@ -517,14 +480,9 @@ static void _XLockDisplay( - for (ti = dpy->error_threads; ti; ti = ti->next) - if (ti->error_thread == xthread_self()) - return; --#endif -+ - _XIDHandler(dpy); - _XSeqSyncFunction(dpy); -- if (dpy->in_ifevent) { -- dpy->lock_fns->lock_display = _XIfEventLockDisplay; -- dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay; -- dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay; -- } - } - - /* -@@ -537,6 +495,9 @@ static void _XInternalLockDisplay( - XTHREADS_FILE_LINE_ARGS - ) - { -+ if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) -+ return; -+ - #ifdef XTHREADS_WARN - _XLockDisplayWarn(dpy, file, line); - #else --- -GitLab diff --git a/x11-libs/libX11/files/libX11-1.8.3-revert-XPutBackEvent.patch b/x11-libs/libX11/files/libX11-1.8.3-revert-XPutBackEvent.patch deleted file mode 100644 index b210defcf664..000000000000 --- a/x11-libs/libX11/files/libX11-1.8.3-revert-XPutBackEvent.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://bugs.gentoo.org/886349 -https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/176 -https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/174 -https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/88399e01be679bfcc9a5e8922ffe2c47f0e56dee - -From 88399e01be679bfcc9a5e8922ffe2c47f0e56dee Mon Sep 17 00:00:00 2001 -From: Yuxuan Shui <[email protected]> -Date: Tue, 3 Jan 2023 15:09:28 +0000 -Subject: [PATCH] Revert "Update XPutBackEvent() to support clients that put - back unpadded events" - -This reverts commit d6d6cba90215d323567fef13d6565756c9956f60. - -The reverted commit intended to fix the problem where an unpadded X -event struct is passed into XPutBackEvent, by creating a padded struct -with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the -last sequence number in Display, which may cause xlib to complain about -lost sequence numbers. - -IMO, the problem that commit tried to solve is a bug in the client -library, and workaround it inside Xlib is bad practice, especially given -the problem it caused. Plus, the offender cited in the original commit -message, freeglut, has already fixed this problem. - -Fixes: #176 #174 - -Signed-off-by: Yuxuan Shui <[email protected]> ---- a/src/PutBEvent.c -+++ b/src/PutBEvent.c -@@ -79,22 +79,9 @@ XPutBackEvent ( - register XEvent *event) - { - int ret; -- xEvent wire = {0}; -- XEvent lib = {0}; -- Status (*fp)(Display *, XEvent *, xEvent *); -- int type = event->type & 0177; - - LockDisplay(dpy); -- fp = dpy->wire_vec[type]; -- if (fp == NULL) -- fp = _XEventToWire; -- ret = (*fp)(dpy, event, &wire); -- if (ret) -- { -- ret = (*dpy->event_vec[type])(dpy, &lib, &wire); -- if (ret) -- ret = _XPutBackEvent(dpy, &lib); -- } -+ ret = _XPutBackEvent(dpy, event); - UnlockDisplay(dpy); - return ret; - } --- -GitLab - - diff --git a/x11-libs/libX11/libX11-1.7.5.ebuild b/x11-libs/libX11/libX11-1.7.5.ebuild deleted file mode 100644 index 30015bc8dc2d..000000000000 --- a/x11-libs/libX11/libX11-1.7.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX=xz -inherit toolchain-funcs xorg-3 - -# Note: please bump this with x11-misc/compose-tables -DESCRIPTION="X.Org X11 library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] - x11-misc/compose-tables" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/xtrans" -BDEPEND="test? ( dev-lang/perl )" - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_with doc xmlto) - $(use_enable doc specs) - $(use_enable ipv6) - --without-fop - CPP="$(tc-getPROG CPP cpp)" - ) - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - rm -rf "${ED}"/usr/share/X11/locale || die -} diff --git a/x11-libs/libX11/libX11-1.8.1.ebuild b/x11-libs/libX11/libX11-1.8.1.ebuild deleted file mode 100644 index f6a020105422..000000000000 --- a/x11-libs/libX11/libX11-1.8.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX=xz -inherit toolchain-funcs xorg-3 - -# Note: please bump this with x11-misc/compose-tables -DESCRIPTION="X.Org X11 library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] - x11-misc/compose-tables - - !<xfce-base/xfce4-settings-4.16.3 -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/xtrans -" -BDEPEND="test? ( dev-lang/perl )" - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_with doc xmlto) - $(use_enable doc specs) - --enable-ipv6 - --without-fop - CPP="$(tc-getPROG CPP cpp)" - ) - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - rm -rf "${ED}"/usr/share/X11/locale || die -} diff --git a/x11-libs/libX11/libX11-1.8.3-r1.ebuild b/x11-libs/libX11/libX11-1.8.3-r1.ebuild deleted file mode 100644 index a24f4cae12dd..000000000000 --- a/x11-libs/libX11/libX11-1.8.3-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX=xz -inherit toolchain-funcs xorg-3 - -# Note: please bump this with x11-misc/compose-tables -DESCRIPTION="X.Org X11 library" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] - x11-misc/compose-tables - - !<xfce-base/xfce4-settings-4.16.3 -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/xtrans -" -BDEPEND="test? ( dev-lang/perl )" - -PATCHES=( - "${FILESDIR}"/${P}-revert-XPutBackEvent.patch - "${FILESDIR}"/${P}-reentrancy-again.patch -) - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_with doc xmlto) - $(use_enable doc specs) - --enable-ipv6 - --without-fop - CPP="$(tc-getPROG CPP cpp)" - ) - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - rm -rf "${ED}"/usr/share/X11/locale || die -}
