Date: Friday, January 6, 2023 @ 10:48:43
Author: andyrtr
Revision: 466071
archrelease: copy trunk to testing-x86_64
Added:
libx11/repos/testing-x86_64/
libx11/repos/testing-x86_64/0001-Revert_Update_XPutBackEvent.diff
(from rev 466070, libx11/trunk/0001-Revert_Update_XPutBackEvent.diff)
libx11/repos/testing-x86_64/PKGBUILD
(from rev 466070, libx11/trunk/PKGBUILD)
libx11/repos/testing-x86_64/keys/
---------------------------------------+
0001-Revert_Update_XPutBackEvent.diff | 57 ++++++++++++++++++++++++++++++++
PKGBUILD | 53 +++++++++++++++++++++++++++++
2 files changed, 110 insertions(+)
Copied: libx11/repos/testing-x86_64/0001-Revert_Update_XPutBackEvent.diff (from
rev 466070, libx11/trunk/0001-Revert_Update_XPutBackEvent.diff)
===================================================================
--- testing-x86_64/0001-Revert_Update_XPutBackEvent.diff
(rev 0)
+++ testing-x86_64/0001-Revert_Update_XPutBackEvent.diff 2023-01-06
10:48:43 UTC (rev 466071)
@@ -0,0 +1,57 @@
+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]>
+---
+ src/PutBEvent.c | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/src/PutBEvent.c b/src/PutBEvent.c
+index f7b74b31..0f9df342 100644
+--- 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
+
Copied: libx11/repos/testing-x86_64/PKGBUILD (from rev 466070,
libx11/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2023-01-06 10:48:43 UTC (rev 466071)
@@ -0,0 +1,53 @@
+# Maintainer: Andreas Radke <[email protected]>
+
+pkgname=libx11
+pkgver=1.8.3
+pkgrel=4
+pkgdesc="X11 client-side library"
+arch=(x86_64)
+url="https://xorg.freedesktop.org/";
+# keep xorgproto runtime dependency
+#
https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
+depends=('libxcb' 'xorgproto')
+makedepends=('xorg-util-macros' 'xtrans')
+license=('custom')
+options=('debug')
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}
+ 0001-Revert_Update_XPutBackEvent.diff)
+sha512sums=('bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325'
+ 'SKIP'
+
'1db742e84c6373d6ce2273c82e5e9b72d7943eea4ffedc9b99570037072ae2cfdf7cd318bf4d5fc6da908304286068e8ba181f6a12cb21b15d47699e77b51341')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith
<[email protected]>
+#validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb
<[email protected]>
+#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner
<[email protected]>
+#validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson
<[email protected]>
+#validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard
<[email protected]>"
+
+prepare() {
+ cd libX11-${pkgver}
+ # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/180 //
fixes also MR #176/#187
+ # should fix FS#76669; FS#69295; FS#76860
+ patch -Np1 -i ../0001-Revert_Update_XPutBackEvent.diff
+}
+
+build() {
+ cd libX11-${pkgver}
+ ./configure --prefix=/usr \
+ --disable-static \
+ --disable-xf86bigfont
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd libX11-${pkgver}
+ make check
+}
+
+package() {
+ cd "${srcdir}/libX11-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
