From 55b20c97078ded20d0e7c6b3ef33d673c861d8b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Mar 2023 00:16:43 +0000 Subject: gentoo auto-resync : 14:03:2023 - 00:16:42 --- x11-libs/Manifest.gz | Bin 18489 -> 18477 bytes x11-libs/cairo/Manifest | 5 +- x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +- x11-libs/cairo/cairo-1.17.6.ebuild | 100 ----------- x11-libs/cairo/metadata.xml | 3 - x11-libs/libX11/Manifest | 10 +- .../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 ------ x11-libs/libX11/libX11-1.8.4.ebuild | 2 +- x11-libs/libdrm/Manifest | 4 +- x11-libs/libdrm/libdrm-2.4.114.ebuild | 66 -------- x11-libs/libdrm/libdrm-2.4.115.ebuild | 2 +- x11-libs/libxkbcommon/Manifest | 4 +- x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild | 62 ------- x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild | 2 +- 18 files changed, 9 insertions(+), 631 deletions(-) delete mode 100644 x11-libs/cairo/cairo-1.17.6.ebuild delete mode 100644 x11-libs/libX11/files/libX11-1.8.3-reentrancy-again.patch delete mode 100644 x11-libs/libX11/files/libX11-1.8.3-revert-XPutBackEvent.patch delete mode 100644 x11-libs/libX11/libX11-1.7.5.ebuild delete mode 100644 x11-libs/libX11/libX11-1.8.1.ebuild delete mode 100644 x11-libs/libX11/libX11-1.8.3-r1.ebuild delete mode 100644 x11-libs/libdrm/libdrm-2.4.114.ebuild delete mode 100644 x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild (limited to 'x11-libs') diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz index f8531b58c759..ade87d3b866f 100644 Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index e8324761803f..5acc5b2848cb 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -2,8 +2,7 @@ AUX 1.17.8-tee-Fix-cairo-wrapper-functions.patch 3881 BLAKE2B 3d1d7f000480dceab9 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185 DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8 -EBUILD cairo-1.17.6-r1.ebuild 2375 BLAKE2B ac648f13bff7a929d4121ec3095d2bf58b320bf37440bb49ee2d373defb28bc29219de0885f3f6397fa3adfe296f73e8aa74a05aa000e87ac4171478b694771c SHA512 289c1424811ea0d8605a07015e60aa0f71bd2988b6c7581f126dfc6e386bfbc78860fb3ab95a575c632c5783f60da5b8300841f5804a15bfe68eaf94e7030c99 -EBUILD cairo-1.17.6.ebuild 2835 BLAKE2B 6d3239007d7bfa930aef8921756a95f68fafc4e316d48c9e65333313779f8fdb9839505dac7067869511b2f81336dbba254f8c2b366ddcb2f3937c809a3666c8 SHA512 a8195ce1e421200eca17618fcd768697ae78910deae20e97e8644cb1476ca1dd82979d8835902bd5a870855d099e98123fa8318fbf2e0ec819ab539bce9b52ea +EBUILD cairo-1.17.6-r1.ebuild 2374 BLAKE2B 9f1428010f734e2d902feec3ef187cd954b7e90a3f770cc63dd6a9310709e44c99a949ad7e00566a738df53ef33cf28952ed5ae770cb2240908e0d59e2571fbe SHA512 879083cbf4ff217a41739e1f5654d2f4370f77f6028f46aa51d70d9791553c31337bbe626bc60ce0127c23ef3ac68066d42c190f8acc019e14dabb5f502b2652 EBUILD cairo-1.17.8.ebuild 2474 BLAKE2B beeddbbc81d1bb0417ecdccfc5b38006f98da053ca32e3d0c9057631a37d043f14caafac72052278825225a71b0133fc9132f0cf711d8be508fc016c90daec0e SHA512 f2df956be6c98db0aced517832e5ba7125bf626295860c4f4c0f69ef381b72c5ad8698a8bd31819c402721f3dc9bc657f35cca7317d2f54ba251284d061ec496 EBUILD cairo-9999.ebuild 2382 BLAKE2B b8f4df85966a21baa6bb29f18f8f969e2a839b79aa9dd7513a497341e7ae6ad518f297094f3cec4a74bf24af910421ecec23f16be6f4c4ae97e0d923aad4c861 SHA512 1f69ef6585c3e33deef78806fc35fa35fb39e56d7eadc39b6c92e831a8f18ad69eb026e13fe0d313b5e2205e8de2e8ccd39ba509847e32e5a8625fad8e1905b7 -MISC metadata.xml 781 BLAKE2B 93cef84890039f9bbf75544a857cf611b3444fed5f82611d0f180de9c0df4ec5ea468b569cf99d158135354bec1d06c3aab97e139840db7e18d2b0b8ce350731 SHA512 c8008c604fa8956301078eced6c2c355f0205d9fcdfae68da39b1019fa54724239c713cbbd5f44f3d4d1b4d4d21a75248a00e7da4adffbb1974b6c2d36a30ee7 +MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988 diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild index b5f91f28230d..a44a2cd3aa6a 100644 --- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild +++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A vector graphics library with cross-device output support" diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild b/x11-libs/cairo/cairo-1.17.6.ebuild deleted file mode 100644 index 156fa08987a5..000000000000 --- a/x11-libs/cairo/cairo-1.17.6.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git" - SRC_URI="" -else - SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test" -REQUIRED_USE=" - gles2-only? ( !opengl ) - gles3? ( gles2-only ) -" -RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib - -RDEPEND=" - >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}] - >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] - debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) - gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) - glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-respect-fontconfig.patch -) - -multilib_src_configure() { - local emesonargs=( - -Dfontconfig=enabled - -Dfreetype=enabled - -Dpng=enabled - $(meson_feature aqua quartz) - $(meson_feature X tee) - $(meson_feature X xcb) - $(meson_feature X xlib) - -Dxlib-xcb=disabled - -Dxml=disabled - -Dzlib=enabled - - $(meson_feature test tests) - - -Dgtk2-utils=disabled - - $(meson_feature glib) - -Dspectre=disabled # only used for tests - $(meson_feature debug symbol-lookup) - - $(meson_use gtk-doc gtk_doc) - ) - - if use opengl; then - emesonargs+=(-Dgl-backend=gl) - elif use gles2-only; then - if use gles3; then - emesonargs+=(-Dgl-backend=glesv3) - else - emesonargs+=(-Dgl-backend=glesv2) - fi - else - emesonargs+=(-Dgl-backend=disabled) - fi - - meson_src_configure -} - -multilib_src_install_all() { - einstalldocs - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die - mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die - rmdir "${ED}"/usr/share/gtk-doc/html || die - fi -} diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml index bdaadf1326b7..8b4901f0d9a8 100644 --- a/x11-libs/cairo/metadata.xml +++ b/x11-libs/cairo/metadata.xml @@ -6,9 +6,6 @@ X11 - Build the OpenGL backend - Build the OpenGL ES 2 backend - Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only) Compile with GLib Object System support diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index ceb77829fbe8..6df18aa0a23f 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,11 +1,3 @@ -AUX libX11-1.8.3-reentrancy-again.patch 4713 BLAKE2B e2d308bd011120655009e5af1e5cbbefa217c3de1c7e78d3ddc64d0ce02535cc63903696ec21cb5743b49ee016a3c8ded22ee62a2f1256b71c0f245c51108de5 SHA512 a6a2f504fe7b860a86ac140c2b1ad7ca3c4a8fc2170535a5cac365bf8de40fa576f0d05134b1eb316192b4acb909bba473298704b18c7c1e1602e2a4f56e592f -AUX libX11-1.8.3-revert-XPutBackEvent.patch 1772 BLAKE2B b60d6cb535d6557fb2ba84a962af77481c6ebd1780d23869172cb331a09f7638fee75deeb73b02a5c37f658f5d04d2b90a6f5c9d91121c187f9d98a311c3c718 SHA512 df965ba65ca448686e200feaee11f8f9fb90b27fd2def30aee930d21b03682ed83613d3630b024fe6d1fd2894e76fa35ff8d04afc6e958981ed9b3e8f51e834c -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 -EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32 -EBUILD libX11-1.8.1.ebuild 966 BLAKE2B 4ad188c9d7030b656da151da82ecb7cd776deae774c5809e79a7a3f3fbd34ef0d7b54c822b4f7d748fc881293366b1c5e89817ce19e00c701e1d8186c9d40982 SHA512 5f361d9291ad4c0f04d6449efe244196c612bfbb3ba6342ca2da45dab3c169e306302e0e200ecd60d9a1bcc0e94cf9781807d9bf60f6573012b444d0d258800b -EBUILD libX11-1.8.3-r1.ebuild 1077 BLAKE2B f240ab8a5fff1bea892e6636e780b66ef9ef639399dad44651cac05a86b23bb2fdee75721b40b29116860296e87b8e9fee124c9ed76cc7b82dc90fd0571ce834 SHA512 9ae6a254edb95cbaff3d0de9c7d6966fbc6718d4dfc1a8f3eda427a7e9e6df0816ddf8d1cace87cb25763aa635b65c4ae33639ff9d45d60263a6174322c6b276 -EBUILD libX11-1.8.4.ebuild 967 BLAKE2B 758e030f4f0133b27d2a579a2d3447d1188f5008991287e1c2625292e459d8d965cb63b4c33b991780f9b36a5812c8edccea66e2d9f0eea065f3489465855a9f SHA512 fc8063827e672268c5149d949ab8580abcd333f5f48b07b528d8c362a5ab11260488223f05c39954bd2070005a3003574a9c18055d43d259e36fbbfc13297aad +EBUILD libX11-1.8.4.ebuild 966 BLAKE2B 6f6a5cacfd67cfa3d7ed3c1ad7c70fcda9fe449910b31b9568d383a967e568c1ba43aa43b6dda4e0651241a39f9810326a400bf3118c4028c5978bdf0d9f4998 SHA512 dd2d20662183d4f71d53f96d27e424ec5113a9b7b2db738f4c11a4a1a7cf925be243a351b922191a21f41fb91579b145aa54761ade832d11b375e472e0c57328 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f 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 -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 /* to declare xEvent */ - #include /* for configured options like XTHREADS */ - -+#ifdef XTHREADS -+#include -+#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 -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 ---- 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 - - !