diff --git a/libx11/177.diff b/libx11/177.diff new file mode 100644 index 0000000..dfc886f --- /dev/null +++ b/libx11/177.diff @@ -0,0 +1,32 @@ +diff --git a/src/PutBEvent.c b/src/PutBEvent.c +index f7b74b31deeba41a47816a53bbccf5319810ffb3..b8273e1adca11f6a7cee0199729a0908c2888937 100644 +--- a/src/PutBEvent.c ++++ b/src/PutBEvent.c +@@ -85,15 +85,20 @@ XPutBackEvent ( + int type = event->type & 0177; + + LockDisplay(dpy); +- fp = dpy->wire_vec[type]; +- if (fp == NULL) +- fp = _XEventToWire; +- ret = (*fp)(dpy, event, &wire); +- if (ret) ++ if (type == GenericEvent) ++ ret = _XPutBackEvent(dpy, event); ++ else + { +- ret = (*dpy->event_vec[type])(dpy, &lib, &wire); ++ fp = dpy->wire_vec[type]; ++ if (fp == NULL) ++ fp = _XEventToWire; ++ ret = (*fp)(dpy, event, &wire); + if (ret) +- ret = _XPutBackEvent(dpy, &lib); ++ { ++ ret = (*dpy->event_vec[type])(dpy, &lib, &wire); ++ if (ret) ++ ret = _XPutBackEvent(dpy, &lib); ++ } + } + UnlockDisplay(dpy); + return ret; diff --git a/libx11/PKGBUILD b/libx11/PKGBUILD index e74a5b4..39c4d56 100644 --- a/libx11/PKGBUILD +++ b/libx11/PKGBUILD @@ -7,7 +7,7 @@ pkgname=libx11 pkgver=1.8.3 -pkgrel=02 +pkgrel=03 pkgdesc="X11 client-side library w/o ipv6" arch=(x86_64) url="https://xorg.freedesktop.org/" @@ -17,13 +17,17 @@ depends=('libxcb' 'xorgproto') makedepends=('xorg-util-macros' 'xtrans') # options=('debug') ## uncomment this line to have the debug pkg produced source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig} - 176.diff) + 176.diff + 177.diff) prepare() { cd libX11-${pkgver} # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/176 - # should fix FS#76860 + FS#76669 - patch -Np1 -i ../176.diff + # should fix FS#76669 + patch -Np1 -i ../176.diff + # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/177 + # should fix FS#76860 + patch -Np1 -i ../177.diff } build() { @@ -63,6 +67,7 @@ validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith #validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb #validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner @@ -26,8 +28,11 @@ validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith