diff options
| author | khorben <khorben@pkgsrc.org> | 2020-09-28 01:08:15 +0000 |
|---|---|---|
| committer | khorben <khorben@pkgsrc.org> | 2020-09-28 01:08:15 +0000 |
| commit | 6637c1f9eca5ff69ce11944717027c1f1b0dbcec (patch) | |
| tree | 964ec7bf9f80f86be5fbe006b2c19278451340f6 /x11 | |
| parent | 9e9acf7bada49472db65e766f1e578254d628d50 (diff) | |
| download | pkgsrc-6637c1f9eca5ff69ce11944717027c1f1b0dbcec.tar.gz | |
modular-xorg-xephyr: fix Xephyr visual with -parent option
This patch was imported from
https://gitlab.freedesktop.org/xorg/xserver/-/issues/128.
It notably fixes embedding Xephyr into Gtk+ 3 applications, such as
simulator(1) from devel/deforaos-coder.
Tested on netbsd-9/amd64.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 3 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c | 15 | ||||
| -rw-r--r-- | x11/modular-xorg-xephyr/Makefile | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index a8e6ddd19b2..e3189fa83a8 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.103 2020/08/26 10:28:39 wiz Exp $ +$NetBSD: distinfo,v 1.104 2020/09/28 01:08:15 khorben Exp $ SHA1 (xorg-server-1.20.9.tar.bz2) = 4b70ac63fa864f0569712d634a61496d015c3b86 RMD160 (xorg-server-1.20.9.tar.bz2) = 33a2370d1d9ce68774d0ac6fa803f2a4ce19b698 SHA512 (xorg-server-1.20.9.tar.bz2) = d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 Size (xorg-server-1.20.9.tar.bz2) = 6302902 bytes SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8 +SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a diff --git a/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c b/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c new file mode 100644 index 00000000000..a3ece3b72e9 --- /dev/null +++ b/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c @@ -0,0 +1,15 @@ +$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.1 2020/09/28 01:08:15 khorben Exp $ + +Fix Xephyr visual with -parent option + +--- hw/kdrive/ephyr/hostx.c.orig 2020-03-29 20:21:15.000000000 +0000 ++++ hw/kdrive/ephyr/hostx.c +@@ -622,7 +622,7 @@ hostx_init(void) + scrpriv->win_height, + 0, + XCB_WINDOW_CLASS_COPY_FROM_PARENT, +- HostX.visual->visual_id, ++ XCB_COPY_FROM_PARENT, + attr_mask, + attrs); + } diff --git a/x11/modular-xorg-xephyr/Makefile b/x11/modular-xorg-xephyr/Makefile index 151be4902d9..a98157ab8c3 100644 --- a/x11/modular-xorg-xephyr/Makefile +++ b/x11/modular-xorg-xephyr/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2020/08/26 10:29:06 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2020/09/28 01:08:15 khorben Exp $ DISTNAME= xorg-server-${XORG_VERSION} PKGNAME= modular-xorg-xephyr-${XORG_VERSION} +PKGREVISION= 1 DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches |