upg ell iwd libpciaccess libx11 openmpi
This commit is contained in:
parent
847a21bc82
commit
98c07a8bd9
11 changed files with 386 additions and 33 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=ell
|
pkgname=ell
|
||||||
pkgver=0.64
|
pkgver=0.64
|
||||||
pkgrel=01
|
pkgrel=02
|
||||||
pkgdesc="Embedded Linux library"
|
pkgdesc="Embedded Linux library"
|
||||||
url="https://01.org/ell"
|
url="https://01.org/ell"
|
||||||
#url="https://git.kernel.org/pub/scm/libs/ell/ell.git/"
|
#url="https://git.kernel.org/pub/scm/libs/ell/ell.git/"
|
||||||
|
@ -51,5 +51,5 @@ validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann <ma
|
||||||
sha256sums=(760f3901078409f66cadf1bb24c8bdc60f13d53f6dd66b88631221d2494f8405 # ell-0.64.tar.xz
|
sha256sums=(760f3901078409f66cadf1bb24c8bdc60f13d53f6dd66b88631221d2494f8405 # ell-0.64.tar.xz
|
||||||
89deeced603d17f1bde6a33d9311f7943fe7c87fb553de5df96cb24198221af8) # ell-0.64.tar.sign
|
89deeced603d17f1bde6a33d9311f7943fe7c87fb553de5df96cb24198221af8) # ell-0.64.tar.sign
|
||||||
|
|
||||||
## 2637cfbbc172fe691ba24b1b3d2311e66b6e0e445822dc05d3adf3d2b0407ac7 ell-0.64-01-x86_64.pkg.tar.lz
|
## 18712c1526274e6ac4a3821ea3d739e5f25110fba2fe9923245f1652c7aefa15 ell-0.64-02-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
pkgname=ell
|
pkgname=ell
|
||||||
pkgver=0.64
|
pkgver=0.64
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="Embedded Linux library"
|
pkgdesc="Embedded Linux library"
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
url="https://01.org/ell"
|
url="https://01.org/ell"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=iwd
|
pkgname=iwd
|
||||||
pkgver=2.17
|
pkgver=2.17
|
||||||
pkgrel=01
|
pkgrel=02
|
||||||
pkgdesc='Internet Wireless Daemon w/o systemd'
|
pkgdesc='Internet Wireless Daemon w/o systemd'
|
||||||
url='https://git.kernel.org/cgit/network/wireless/iwd.git/'
|
url='https://git.kernel.org/cgit/network/wireless/iwd.git/'
|
||||||
depends=('glibc' 'readline' 'libreadline.so' 'ell' 'gcc-libs')
|
depends=('glibc' 'readline' 'libreadline.so' 'ell' 'gcc-libs')
|
||||||
|
@ -76,6 +76,5 @@ sha256sums=(5901ab3fbb74bb75ec9adda35daeff595e4d238882fee7fc8c805b30ca79d943 #
|
||||||
57c46389ac953737d5a1fb91e2cecfe972dfcf8f192823b777e3f5735dcafbc5 # iwd-2.17.tar.sign
|
57c46389ac953737d5a1fb91e2cecfe972dfcf8f192823b777e3f5735dcafbc5 # iwd-2.17.tar.sign
|
||||||
d5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7) # 0001-use-network-group-for-unprivileged-access.diff
|
d5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7) # 0001-use-network-group-for-unprivileged-access.diff
|
||||||
|
|
||||||
|
## ae263e11533afb653786f91e3d3b50e1e595bafc3294d99601dba191789a0015 iwd-2.17-02-x86_64.pkg.tar.lz
|
||||||
## 33f83f43585f8975905614f2d7f73ee740e9e202408042cac9ef380d0f18f1ac iwd-2.17-01-x86_64.pkg.tar.lz
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
pkgname=iwd
|
pkgname=iwd
|
||||||
pkgver=2.17
|
pkgver=2.17
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc='Internet Wireless Daemon'
|
pkgdesc='Internet Wireless Daemon'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url='https://git.kernel.org/cgit/network/wireless/iwd.git/'
|
url='https://git.kernel.org/cgit/network/wireless/iwd.git/'
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=libpciaccess
|
pkgname=libpciaccess
|
||||||
pkgver=0.18.1
|
pkgver=0.18.1
|
||||||
pkgrel=01
|
pkgrel=02
|
||||||
pkgdesc="X11 PCI access library"
|
pkgdesc="X11 PCI access library"
|
||||||
#url="https://xorg.freedesktop.org/"
|
#url="https://xorg.freedesktop.org/"
|
||||||
url="https://gitlab.freedesktop.org/xorg/lib/libpciaccess"
|
url="https://gitlab.freedesktop.org/xorg/lib/libpciaccess"
|
||||||
|
@ -48,5 +48,5 @@ validpgpkeys=(4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E) # Alan Coopersmith <alan
|
||||||
sha256sums=(4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76 # libpciaccess-0.18.1.tar.xz
|
sha256sums=(4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76 # libpciaccess-0.18.1.tar.xz
|
||||||
80460d40f59fea5a3177eaf139c503a3724b9ba0d01ca124d4f54f97001c89b2) # libpciaccess-0.18.1.tar.xz.sig
|
80460d40f59fea5a3177eaf139c503a3724b9ba0d01ca124d4f54f97001c89b2) # libpciaccess-0.18.1.tar.xz.sig
|
||||||
|
|
||||||
## 283dbf81aa6a2b537cecaa54d59e04a30d7ec5428ee3c4a5bd521a236239f433 libpciaccess-0.18.1-01-x86_64.pkg.tar.lz
|
## dce5000f740918c40d58d2440f6d09a49fde7ed45b0d0ad30f6032fd427634b4 libpciaccess-0.18.1-02-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
pkgname=libpciaccess
|
pkgname=libpciaccess
|
||||||
pkgver=0.18.1
|
pkgver=0.18.1
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="X11 PCI access library"
|
pkgdesc="X11 PCI access library"
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
license=('LicenseRef-libpciaccess')
|
license=('LicenseRef-libpciaccess')
|
||||||
|
|
344
libx11/MR236.patch
Normal file
344
libx11/MR236.patch
Normal file
|
@ -0,0 +1,344 @@
|
||||||
|
From 024d229fdf88a7755577b01b46af6ef908d599e0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takao Fujiwara <tfujiwar@redhat.com>
|
||||||
|
Date: Wed, 31 Jan 2024 20:26:40 +0900
|
||||||
|
Subject: [PATCH 1/2] ximcp: Unmark to fabricate key events with XKeyEvent
|
||||||
|
serial
|
||||||
|
|
||||||
|
_XimProtoKeypressFilter() and _XimProtoKeyreleaseFilter() can
|
||||||
|
receive XKeyEvent from both the typing on the keyboard and the
|
||||||
|
callback of XIM_FORWARD_EVENT.
|
||||||
|
|
||||||
|
If the filter functions unmark to fabricate XKeyEvent from the typing
|
||||||
|
on the keyboard during receiving XKeyEvent from the callback of
|
||||||
|
XIM_FORWARD_EVENT with typing keys very quickly likes an bar code
|
||||||
|
scanner (or evemu-play), XIM server cannot receive some key events and
|
||||||
|
it causes the key typing order to get scrambled.
|
||||||
|
|
||||||
|
Now XIM client saves the serial in XKeyEvent and the filter functions
|
||||||
|
unmark to fabricate XKeyEvent from the callback of XIM_FORWARD_EVENT
|
||||||
|
only.
|
||||||
|
|
||||||
|
Fixes: #198
|
||||||
|
---
|
||||||
|
modules/im/ximcp/imDefFlt.c | 8 ++---
|
||||||
|
modules/im/ximcp/imDefIm.c | 1 +
|
||||||
|
modules/im/ximcp/imDefLkup.c | 58 ++++++++++++++++++++++++++++++++----
|
||||||
|
src/xlibi18n/XimintP.h | 17 +++++++++++
|
||||||
|
4 files changed, 75 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c
|
||||||
|
index 44cc6884..834b9db4 100644
|
||||||
|
--- a/modules/im/ximcp/imDefFlt.c
|
||||||
|
+++ b/modules/im/ximcp/imDefFlt.c
|
||||||
|
@@ -142,9 +142,9 @@ _XimProtoKeypressFilter(
|
||||||
|
{
|
||||||
|
Xim im = (Xim)ic->core.im;
|
||||||
|
|
||||||
|
- if (IS_FABRICATED(im)) {
|
||||||
|
+ if (_XimIsFabricatedSerial(im, ev->serial)) {
|
||||||
|
_XimPendingFilter(ic);
|
||||||
|
- UNMARK_FABRICATED(im);
|
||||||
|
+ _XimUnfabricateSerial(im, ev->serial);
|
||||||
|
return NOTFILTERD;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -203,9 +203,9 @@ _XimProtoKeyreleaseFilter(
|
||||||
|
{
|
||||||
|
Xim im = (Xim)ic->core.im;
|
||||||
|
|
||||||
|
- if (IS_FABRICATED(im)) {
|
||||||
|
+ if (_XimIsFabricatedSerial(im, ev->serial)) {
|
||||||
|
_XimPendingFilter(ic);
|
||||||
|
- UNMARK_FABRICATED(im);
|
||||||
|
+ _XimUnfabricateSerial(im, ev->serial);
|
||||||
|
return NOTFILTERD;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/modules/im/ximcp/imDefIm.c b/modules/im/ximcp/imDefIm.c
|
||||||
|
index fe4d18ba..ac7f1195 100644
|
||||||
|
--- a/modules/im/ximcp/imDefIm.c
|
||||||
|
+++ b/modules/im/ximcp/imDefIm.c
|
||||||
|
@@ -430,6 +430,7 @@ _XimPreConnect(
|
||||||
|
return False;
|
||||||
|
|
||||||
|
im->private.proto.im_window = im_window;
|
||||||
|
+ im->private.proto.fabricated_serial = 0;
|
||||||
|
return True;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
|
||||||
|
index dd1adf53..5192e8c1 100644
|
||||||
|
--- a/modules/im/ximcp/imDefLkup.c
|
||||||
|
+++ b/modules/im/ximcp/imDefLkup.c
|
||||||
|
@@ -341,6 +341,54 @@ _XimForwardEvent(
|
||||||
|
return _XimForwardEventCore(ic, ev, sync);
|
||||||
|
}
|
||||||
|
|
||||||
|
+Bool
|
||||||
|
+_XimFabricateSerial(
|
||||||
|
+ Xim im,
|
||||||
|
+ unsigned long serial)
|
||||||
|
+{
|
||||||
|
+ if (!serial)
|
||||||
|
+ return False;
|
||||||
|
+ if (serial == im->private.proto.fabricated_serial) {
|
||||||
|
+ fprintf(stderr, "%s,%d: The key event is already fabricated.\n", __FILE__, __LINE__);
|
||||||
|
+ return False;
|
||||||
|
+ }
|
||||||
|
+ if (im->private.proto.fabricated_serial)
|
||||||
|
+ fprintf(stderr, "%s,%d: Tried to fabricate a wrong key event.\n", __FILE__, __LINE__);
|
||||||
|
+
|
||||||
|
+ MARK_FABRICATED(im);
|
||||||
|
+ im->private.proto.fabricated_serial = serial;
|
||||||
|
+ return True;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+Bool
|
||||||
|
+_XimUnfabricateSerial(
|
||||||
|
+ Xim im,
|
||||||
|
+ unsigned long serial)
|
||||||
|
+{
|
||||||
|
+ if (!serial)
|
||||||
|
+ return False;
|
||||||
|
+ if (!im->private.proto.fabricated_serial) {
|
||||||
|
+ fprintf(stderr, "%s,%d: The key event is already unfabricated.\n", __FILE__, __LINE__);
|
||||||
|
+ return False;
|
||||||
|
+ }
|
||||||
|
+ if (serial != im->private.proto.fabricated_serial)
|
||||||
|
+ fprintf(stderr, "%s,%d: Tried to unfabricate a wrong key event.\n", __FILE__, __LINE__);
|
||||||
|
+
|
||||||
|
+ im->private.proto.fabricated_serial = 0;
|
||||||
|
+ UNMARK_FABRICATED(im);
|
||||||
|
+ return True;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+Bool
|
||||||
|
+_XimIsFabricatedSerial(
|
||||||
|
+ Xim im,
|
||||||
|
+ unsigned long serial)
|
||||||
|
+{
|
||||||
|
+ if (!serial)
|
||||||
|
+ return False;
|
||||||
|
+ return (serial == im->private.proto.fabricated_serial);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void
|
||||||
|
_XimProcEvent(
|
||||||
|
Display *d,
|
||||||
|
@@ -355,7 +403,7 @@ _XimProcEvent(
|
||||||
|
ev->xany.serial |= serial << 16;
|
||||||
|
ev->xany.send_event = False;
|
||||||
|
ev->xany.display = d;
|
||||||
|
- MARK_FABRICATED(ic->core.im);
|
||||||
|
+ _XimFabricateSerial((Xim)ic->core.im, ev->xany.serial);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -704,10 +752,6 @@ _XimCommitRecv(
|
||||||
|
|
||||||
|
(void)_XimRespSyncReply(ic, flag);
|
||||||
|
|
||||||
|
- if (ic->private.proto.registed_filter_event
|
||||||
|
- & (KEYPRESS_MASK | KEYRELEASE_MASK))
|
||||||
|
- MARK_FABRICATED(im);
|
||||||
|
-
|
||||||
|
bzero(&ev, sizeof(ev)); /* uninitialized : found when running kterm under valgrind */
|
||||||
|
|
||||||
|
ev.type = KeyPress;
|
||||||
|
@@ -719,6 +763,10 @@ _XimCommitRecv(
|
||||||
|
|
||||||
|
ev.time = 0L;
|
||||||
|
ev.serial = LastKnownRequestProcessed(im->core.display);
|
||||||
|
+
|
||||||
|
+ if (ic->private.proto.registed_filter_event
|
||||||
|
+ & (KEYPRESS_MASK | KEYRELEASE_MASK))
|
||||||
|
+ _XimFabricateSerial(im, ev.serial);
|
||||||
|
/* FIXME :
|
||||||
|
I wish there were COMMENTs (!) about the data passed around.
|
||||||
|
*/
|
||||||
|
diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h
|
||||||
|
index 674da029..2a51e2ed 100644
|
||||||
|
--- a/src/xlibi18n/XimintP.h
|
||||||
|
+++ b/src/xlibi18n/XimintP.h
|
||||||
|
@@ -149,6 +149,8 @@ typedef struct _XimProtoPrivateRec {
|
||||||
|
XimTransRegDispatcher register_dispatcher;
|
||||||
|
XimTransCallDispatcher call_dispatcher;
|
||||||
|
XPointer spec;
|
||||||
|
+
|
||||||
|
+ unsigned long fabricated_serial;
|
||||||
|
} XimProtoPrivateRec;
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -307,4 +309,19 @@ typedef struct _XicProtoPrivateRec {
|
||||||
|
#define XIM_MAXIMNAMELEN 64
|
||||||
|
#define XIM_MAXLCNAMELEN 64
|
||||||
|
|
||||||
|
+Bool
|
||||||
|
+_XimFabricateSerial(
|
||||||
|
+ Xim im,
|
||||||
|
+ unsigned long serial);
|
||||||
|
+
|
||||||
|
+Bool
|
||||||
|
+_XimUnfabricateSerial(
|
||||||
|
+ Xim im,
|
||||||
|
+ unsigned long serial);
|
||||||
|
+
|
||||||
|
+Bool
|
||||||
|
+_XimIsFabricatedSerial(
|
||||||
|
+ Xim im,
|
||||||
|
+ unsigned long serial);
|
||||||
|
+
|
||||||
|
#endif /* _XIMINTP_H */
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
|
|
||||||
|
From 041b5291f0956c5cda5054be2981c0d02b009a4c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takao Fujiwara <tfujiwar@redhat.com>
|
||||||
|
Date: Wed, 31 Jan 2024 20:27:57 +0900
|
||||||
|
Subject: [PATCH 2/2] imDefLkup: Commit first info in XimCommitInfo
|
||||||
|
|
||||||
|
Xic.private.proto.commit_info can receive multiple XimCommitInfo
|
||||||
|
when typing keys very quickly like an bar code scanner (or evemu-play)
|
||||||
|
and the first info in XimCommitInfo should be committed to keep
|
||||||
|
the typing key order.
|
||||||
|
|
||||||
|
Fixes: #198
|
||||||
|
---
|
||||||
|
modules/im/ximcp/imDefLkup.c | 60 +++++++++++++++++++++++++++++-------
|
||||||
|
1 file changed, 49 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
|
||||||
|
index 5192e8c1..6ffe6f48 100644
|
||||||
|
--- a/modules/im/ximcp/imDefLkup.c
|
||||||
|
+++ b/modules/im/ximcp/imDefLkup.c
|
||||||
|
@@ -640,22 +640,47 @@ _XimRegCommitInfo(
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
-_XimUnregCommitInfo(
|
||||||
|
- Xic ic)
|
||||||
|
+_XimUnregRealCommitInfo(
|
||||||
|
+ Xic ic,
|
||||||
|
+ Bool reverse)
|
||||||
|
{
|
||||||
|
XimCommitInfo info;
|
||||||
|
+ XimCommitInfo prev_info = NULL;
|
||||||
|
|
||||||
|
- if (!(info = ic->private.proto.commit_info))
|
||||||
|
+ info = ic->private.proto.commit_info;
|
||||||
|
+ while (reverse && info) {
|
||||||
|
+ if (!info->next)
|
||||||
|
+ break;
|
||||||
|
+ prev_info = info;
|
||||||
|
+ info = info->next;
|
||||||
|
+ }
|
||||||
|
+ if (!info)
|
||||||
|
return;
|
||||||
|
|
||||||
|
-
|
||||||
|
Xfree(info->string);
|
||||||
|
Xfree(info->keysym);
|
||||||
|
- ic->private.proto.commit_info = info->next;
|
||||||
|
+ if (prev_info)
|
||||||
|
+ prev_info->next = info->next;
|
||||||
|
+ else
|
||||||
|
+ ic->private.proto.commit_info = info->next;
|
||||||
|
Xfree(info);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void
|
||||||
|
+_XimUnregCommitInfo(
|
||||||
|
+ Xic ic)
|
||||||
|
+{
|
||||||
|
+ _XimUnregRealCommitInfo(ic, False);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+_XimUnregFirstCommitInfo(
|
||||||
|
+ Xic ic)
|
||||||
|
+{
|
||||||
|
+ _XimUnregRealCommitInfo(ic, True);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
_XimFreeCommitInfo(
|
||||||
|
Xic ic)
|
||||||
|
@@ -665,6 +690,19 @@ _XimFreeCommitInfo(
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static XimCommitInfo
|
||||||
|
+_XimFirstCommitInfo(
|
||||||
|
+ Xic ic)
|
||||||
|
+{
|
||||||
|
+ XimCommitInfo info = ic->private.proto.commit_info;
|
||||||
|
+ while (info) {
|
||||||
|
+ if (!info->next)
|
||||||
|
+ break;
|
||||||
|
+ info = info->next;
|
||||||
|
+ }
|
||||||
|
+ return info;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static Bool
|
||||||
|
_XimProcKeySym(
|
||||||
|
Xic ic,
|
||||||
|
@@ -1059,7 +1097,7 @@ _XimProtoMbLookupString(
|
||||||
|
state = &tmp_state;
|
||||||
|
|
||||||
|
if ((ev->type == KeyPress) && (ev->keycode == 0)) { /* Filter function */
|
||||||
|
- if (!(info = ic->private.proto.commit_info)) {
|
||||||
|
+ if (!(info = _XimFirstCommitInfo(ic))) {
|
||||||
|
*state = XLookupNone;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -1075,7 +1113,7 @@ _XimProtoMbLookupString(
|
||||||
|
else
|
||||||
|
*state = XLookupKeySym;
|
||||||
|
}
|
||||||
|
- _XimUnregCommitInfo(ic);
|
||||||
|
+ _XimUnregFirstCommitInfo(ic);
|
||||||
|
|
||||||
|
} else if (ev->type == KeyPress) {
|
||||||
|
ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL);
|
||||||
|
@@ -1122,7 +1160,7 @@ _XimProtoWcLookupString(
|
||||||
|
state = &tmp_state;
|
||||||
|
|
||||||
|
if (ev->type == KeyPress && ev->keycode == 0) { /* Filter function */
|
||||||
|
- if (!(info = ic->private.proto.commit_info)) {
|
||||||
|
+ if (!(info = _XimFirstCommitInfo(ic))) {
|
||||||
|
*state = XLookupNone;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -1138,7 +1176,7 @@ _XimProtoWcLookupString(
|
||||||
|
else
|
||||||
|
*state = XLookupKeySym;
|
||||||
|
}
|
||||||
|
- _XimUnregCommitInfo(ic);
|
||||||
|
+ _XimUnregFirstCommitInfo(ic);
|
||||||
|
|
||||||
|
} else if (ev->type == KeyPress) {
|
||||||
|
ret = _XimLookupWCText(ic, ev, buffer, bytes, keysym, NULL);
|
||||||
|
@@ -1185,7 +1223,7 @@ _XimProtoUtf8LookupString(
|
||||||
|
state = &tmp_state;
|
||||||
|
|
||||||
|
if (ev->type == KeyPress && ev->keycode == 0) { /* Filter function */
|
||||||
|
- if (!(info = ic->private.proto.commit_info)) {
|
||||||
|
+ if (!(info = _XimFirstCommitInfo(ic))) {
|
||||||
|
*state = XLookupNone;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -1201,7 +1239,7 @@ _XimProtoUtf8LookupString(
|
||||||
|
else
|
||||||
|
*state = XLookupKeySym;
|
||||||
|
}
|
||||||
|
- _XimUnregCommitInfo(ic);
|
||||||
|
+ _XimUnregFirstCommitInfo(ic);
|
||||||
|
|
||||||
|
} else if (ev->type == KeyPress) {
|
||||||
|
ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
pkgname=libx11
|
pkgname=libx11
|
||||||
pkgver=1.8.8
|
pkgver=1.8.8
|
||||||
pkgrel=02
|
pkgrel=03
|
||||||
pkgdesc="X11 client-side library w/o ipv6"
|
pkgdesc="X11 client-side library w/o ipv6"
|
||||||
url="https://xorg.freedesktop.org/"
|
url="https://xorg.freedesktop.org/"
|
||||||
_url="https://gitlab.freedesktop.org/xorg/lib/libx11"
|
_url="https://gitlab.freedesktop.org/xorg/lib/libx11"
|
||||||
|
@ -15,19 +15,15 @@ _url="https://gitlab.freedesktop.org/xorg/lib/libx11"
|
||||||
# https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
|
# https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
|
||||||
depends=('libxcb' 'glibc' 'xorgproto')
|
depends=('libxcb' 'glibc' 'xorgproto')
|
||||||
makedepends=('xorg-util-macros' 'xtrans')
|
makedepends=('xorg-util-macros' 'xtrans')
|
||||||
#source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}
|
source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}
|
||||||
# 176.diff
|
MR236.patch)
|
||||||
# 0001-Revert_Update_XPutBackEvent.diff)
|
|
||||||
source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig})
|
prepare() {
|
||||||
#prepare() {
|
cd libX11-${pkgver}
|
||||||
# cd libX11-${pkgver}
|
# revert incompatible change - #1
|
||||||
# # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/180 // fixes also MR #176/#187
|
# https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/205
|
||||||
# # should fix FS#76669; FS#69295; FS#76860
|
patch -R -p1 -i ../MR236.patch
|
||||||
# patch -Np1 -i ../0001-Revert_Update_XPutBackEvent.diff
|
}
|
||||||
# # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/176
|
|
||||||
# # should fix FS#76669
|
|
||||||
# patch -Np1 -i ../176.diff
|
|
||||||
#}
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd libX11-${pkgver}
|
cd libX11-${pkgver}
|
||||||
|
@ -66,8 +62,15 @@ license=('MIT AND X11')
|
||||||
#validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard <keithp@keithp.com>"
|
#validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard <keithp@keithp.com>"
|
||||||
validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc@freedesktop.org>
|
validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc@freedesktop.org>
|
||||||
|
|
||||||
|
|
||||||
|
sha512sums=('4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82'
|
||||||
|
'SKIP'
|
||||||
|
'e07b0a7e77c6472019caa9b8c00a065f80f6fcfad292ce939994a420b8fbb3ab226511df566f85a6f944a2b8e0ea0398aa4372ae675d6ef7d6fe7448bf52248c')
|
||||||
|
|
||||||
sha256sums=(46afaebb2dd1a3a7348c0544a4b1c88c51de4bda885fde57d2cf98427ee5cbf6 # libX11-1.8.8.tar.xz
|
sha256sums=(46afaebb2dd1a3a7348c0544a4b1c88c51de4bda885fde57d2cf98427ee5cbf6 # libX11-1.8.8.tar.xz
|
||||||
a7d57456c94d5cb8ed8d173abf44c72f5d889ff35568f64b6b6e082b46402803) # libX11-1.8.8.tar.xz.sig
|
a7d57456c94d5cb8ed8d173abf44c72f5d889ff35568f64b6b6e082b46402803 # libX11-1.8.8.tar.xz.sig
|
||||||
|
614dabfb372c9a9d3d0f875cf945715176425338b54244ad797d2cd5b1c28d5c) # MR236.patch
|
||||||
|
|
||||||
## 34ca6e6fdb3ed30e8fdead41168064795e17d6ec19ea0cae48e4d5edd0d643b5 libx11-1.8.8-02-x86_64.pkg.tar.lz
|
|
||||||
|
## b8232a185c045a720fed5f3107f459bb16e1a4c134ad6374d1ed37b4c6e2ceee libx11-1.8.8-03-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
pkgname=libx11
|
pkgname=libx11
|
||||||
pkgver=1.8.8
|
pkgver=1.8.8
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc="X11 client-side library"
|
pkgdesc="X11 client-side library"
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
url="https://gitlab.freedesktop.org/xorg/lib/libx11"
|
url="https://gitlab.freedesktop.org/xorg/lib/libx11"
|
||||||
|
@ -11,15 +11,24 @@ url="https://gitlab.freedesktop.org/xorg/lib/libx11"
|
||||||
depends=('libxcb' 'glibc' 'xorgproto')
|
depends=('libxcb' 'glibc' 'xorgproto')
|
||||||
makedepends=('xorg-util-macros' 'xtrans')
|
makedepends=('xorg-util-macros' 'xtrans')
|
||||||
license=('MIT AND X11')
|
license=('MIT AND X11')
|
||||||
source=(https://xorg.freedesktop.org//releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig})
|
source=(https://xorg.freedesktop.org//releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}
|
||||||
|
MR236.patch)
|
||||||
sha512sums=('4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82'
|
sha512sums=('4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82'
|
||||||
'SKIP')
|
'SKIP'
|
||||||
|
'e07b0a7e77c6472019caa9b8c00a065f80f6fcfad292ce939994a420b8fbb3ab226511df566f85a6f944a2b8e0ea0398aa4372ae675d6ef7d6fe7448bf52248c')
|
||||||
validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc@freedesktop.org>
|
validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc@freedesktop.org>
|
||||||
#validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb@laas.fr>
|
#validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||||
#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
|
#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
|
||||||
#validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson <ajax@nwnk.net>
|
#validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson <ajax@nwnk.net>
|
||||||
#validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard <keithp@keithp.com>"
|
#validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard <keithp@keithp.com>"
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
cd libX11-${pkgver}
|
||||||
|
# revert incompatible change - #1
|
||||||
|
# https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/205
|
||||||
|
patch -R -p1 -i ../MR236.patch
|
||||||
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd libX11-${pkgver}
|
cd libX11-${pkgver}
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
pkgbase=openmpi
|
pkgbase=openmpi
|
||||||
pkgname=(openmpi) # openmpi-docs)
|
pkgname=(openmpi) # openmpi-docs)
|
||||||
pkgver=5.0.2
|
pkgver=5.0.2
|
||||||
pkgrel=07
|
pkgrel=08
|
||||||
pkgdesc='High performance message passing library (MPI)'
|
pkgdesc='High performance message passing library (MPI)'
|
||||||
url='https://www.open-mpi.org'
|
url='https://www.open-mpi.org'
|
||||||
makedepends=(cuda gcc-fortran gcc-libs glibc hip-runtime-amd hwloc libevent
|
makedepends=(cuda gcc-fortran gcc-libs glibc hip-runtime-amd hwloc libevent
|
||||||
|
@ -118,5 +118,3 @@ license=('BSD-3-Clause AND LicenseRef-MPICH')
|
||||||
|
|
||||||
sha256sums=(ee46ad8eeee2c3ff70772160bff877cbf38c330a0bc3b3ddc811648b3396698f) # openmpi-5.0.2.tar.bz2
|
sha256sums=(ee46ad8eeee2c3ff70772160bff877cbf38c330a0bc3b3ddc811648b3396698f) # openmpi-5.0.2.tar.bz2
|
||||||
|
|
||||||
## ee46ad8eeee2c3ff70772160bff877cbf38c330a0bc3b3ddc811648b3396698f openmpi-5.0.2.tar.bz2
|
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ pkgname=(
|
||||||
openmpi-docs
|
openmpi-docs
|
||||||
)
|
)
|
||||||
pkgver=5.0.2
|
pkgver=5.0.2
|
||||||
pkgrel=7
|
pkgrel=8
|
||||||
pkgdesc='High performance message passing library (MPI)'
|
pkgdesc='High performance message passing library (MPI)'
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
url='https://www.open-mpi.org'
|
url='https://www.open-mpi.org'
|
||||||
|
|
Loading…
Reference in a new issue