upg libx11 unrar
This commit is contained in:
parent
740c83cbb2
commit
f01a90272a
|
|
@ -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;
|
||||
|
|
@ -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 <al
|
|||
|
||||
sha256sums=(e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd # libX11-1.8.3.tar.xz
|
||||
1bbabdabac57d92e4aa6b36027f10cbbf1aac5083e0276ff07b16c4179e167fc # libX11-1.8.3.tar.xz.sig
|
||||
c78b76692cf0d4190847a56b33468c27f9c72c6c786a8bc54b5a6a0be1bc272a) # 176.diff
|
||||
c78b76692cf0d4190847a56b33468c27f9c72c6c786a8bc54b5a6a0be1bc272a # 176.diff
|
||||
02d6937aa7a30d1908a56f5fdbea769953e936b59bda4982afa4cf3db2ab2c69) # 177.diff
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
pkgname=libx11
|
||||
pkgver=1.8.3
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="X11 client-side library"
|
||||
arch=(x86_64)
|
||||
url="https://xorg.freedesktop.org/"
|
||||
|
|
@ -13,10 +13,12 @@ makedepends=('xorg-util-macros' 'xtrans')
|
|||
license=('custom')
|
||||
options=('debug')
|
||||
source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}
|
||||
176.diff)
|
||||
176.diff
|
||||
177.diff)
|
||||
sha512sums=('bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325'
|
||||
'SKIP'
|
||||
'6f5a06e7191b355e5adf48c3391ba66dc2482673b1a485f4c53253c1b800847b9c20c006140b1775644dbd6c77668e588b7df9d6f23aee3e3c9d36b7135c3f8b')
|
||||
'6f5a06e7191b355e5adf48c3391ba66dc2482673b1a485f4c53253c1b800847b9c20c006140b1775644dbd6c77668e588b7df9d6f23aee3e3c9d36b7135c3f8b'
|
||||
'6c6c1c98f36bffb4f492e83f3e76fa6fe07757dff52d72a891c389e94c53350ab7bd1e07fcaaa6e1eea69b6c1138e2bdc5e7466a58a3de5799bca705db478ab0')
|
||||
validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc@freedesktop.org>
|
||||
#validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
|
||||
|
|
@ -26,8 +28,11 @@ validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <al
|
|||
prepare() {
|
||||
cd libX11-${pkgver}
|
||||
# https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/176
|
||||
# should fix FS#76860 + FS#76669
|
||||
# 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() {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgbase=unrar
|
||||
pkgname=(unrar libunrar)
|
||||
pkgver=6.2.2
|
||||
pkgver=6.2.3
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
arch=(x86_64)
|
||||
|
|
@ -48,5 +48,8 @@ package_libunrar() {
|
|||
|
||||
license=(custom)
|
||||
|
||||
sha256sums=(477d6ca7e246caec5412cc83b36c15a4ac837726a892df022919800129107cd5) # unrarsrc-6.2.2.tar.gz
|
||||
sha256sums=(120936e41f826cd63d77a580aeea64c1b79fd3e2434f58ce8184e783b51e5b01) # unrarsrc-6.2.3.tar.gz
|
||||
|
||||
# d873aee7ce51d3a63bd1229889050d37e0974bdcce00ae70bcf54e662547506b libunrar-1:6.2.3-01-x86_64.pkg.tar.xz
|
||||
# d5727f801926a9dc538f0ad506ce836b021147bd0bc6575516abd27f3350033f unrar-1:6.2.3-01-x86_64.pkg.tar.xz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
pkgbase=unrar
|
||||
pkgname=(unrar libunrar)
|
||||
pkgver=6.2.2
|
||||
pkgver=6.2.3
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
arch=(x86_64)
|
||||
url='https://www.rarlab.com/rar_add.htm'
|
||||
license=(custom)
|
||||
source=(https://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz)
|
||||
sha256sums=('477d6ca7e246caec5412cc83b36c15a4ac837726a892df022919800129107cd5')
|
||||
sha256sums=('120936e41f826cd63d77a580aeea64c1b79fd3e2434f58ce8184e783b51e5b01')
|
||||
|
||||
prepare() {
|
||||
sed -e '/CXXFLAGS=/d' -e '/LDFLAGS=/d' -i unrar/makefile # Use system build flags
|
||||
|
|
|
|||
Loading…
Reference in New Issue