[PR PATCH] xorg-server-xwayland: update to 24.1.0

[PR PATCH] xorg-server-xwayland: update to 24.1.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

There is a new pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages xwayland-24.1
https://github.com/void-linux/void-packages/pull/50457

xorg-server-xwayland: update to 24.1.0

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl (cross) 
  - i686 (cross) (fix-i686-build.patch added)
  - aarch64 (cross)
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv7l-musl (cross)
  - armv6l (cross)
  - armv6l-musl (cross)



A patch file from https://github.com/void-linux/void-packages/pull/50457.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xwayland-24.1-50457.patch --]
[-- Type: text/x-diff, Size: 2732 bytes --]

From 059d5c42b81531b0f8dec42fef122b6943bc10f4 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Tue, 21 May 2024 21:47:18 +0300
Subject: [PATCH 1/2] xorg-server-xwayland: update to 24.1.0

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/xorg-server-xwayland/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index a102889c916d8b..cf31812a20e9c2 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,10 +1,10 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=23.2.4
+version=24.1.0
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
- -Ddri3=true -Dxwayland_eglstream=false -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
+ -Ddri3=true -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
  -Dxkb_output_dir=/var/lib/xkb"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-${version}/xserver-xwayland-${version}.tar.gz"
-checksum=e23fb908c5699c9668cba478082f81d8b8fbc3f744f36821554aa087e4f92e36
+checksum=73b308e1054507e6189de090ec98e5e7ea0dcef3a8fde288dd4a2361ac561c6e
 make_check=no # needs xtest repository
 
 post_install() {

From 4b6fcde44bc78cefaaa0e5cce25ca0c885adf608 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Tue, 21 May 2024 22:53:30 +0300
Subject: [PATCH 2/2] xorg-server-xwayland: add fix-i686-build.patch to fix
 building on i686

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 .../patches/fix-i686-build.patch                     | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch

diff --git a/srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch b/srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch
new file mode 100644
index 00000000000000..219cf1186487c2
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch
@@ -0,0 +1,12 @@
+diff --git a/os/osdep.h b/os/osdep.h
+index 0687f568d..d3c5f4e4f 100644
+--- a/os/osdep.h
++++ b/os/osdep.h
+@@ -60,6 +60,7 @@ SOFTWARE.
+ #include <limits.h>
+ #include <stddef.h>
+ #include <X11/Xos.h>
++#include <X11/Xmd.h>
+ 
+ /* If EAGAIN and EWOULDBLOCK are distinct errno values, then we check errno
+  * for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX

Re: [PR PATCH] [Updated] xorg-server-xwayland: update to 24.1.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 805 bytes --]

There is an updated pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages xwayland-24.1
https://github.com/void-linux/void-packages/pull/50457

xorg-server-xwayland: update to 24.1.0

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl (cross) 
  - i686 (cross) (fix-i686-build.patch added)
  - aarch64 (cross)
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv7l-musl (cross)
  - armv6l (cross)
  - armv6l-musl (cross)



A patch file from https://github.com/void-linux/void-packages/pull/50457.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xwayland-24.1-50457.patch --]
[-- Type: text/x-diff, Size: 2416 bytes --]

From 4443ea76fb224a76a375ec230afb0cb64bf5b406 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Tue, 21 May 2024 23:00:26 +0300
Subject: [PATCH] xorg-server-xwayland: update to 24.1.0

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 .../patches/fix-i686-build.patch                     | 12 ++++++++++++
 srcpkgs/xorg-server-xwayland/template                |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch

diff --git a/srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch b/srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch
new file mode 100644
index 00000000000000..219cf1186487c2
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/patches/fix-i686-build.patch
@@ -0,0 +1,12 @@
+diff --git a/os/osdep.h b/os/osdep.h
+index 0687f568d..d3c5f4e4f 100644
+--- a/os/osdep.h
++++ b/os/osdep.h
+@@ -60,6 +60,7 @@ SOFTWARE.
+ #include <limits.h>
+ #include <stddef.h>
+ #include <X11/Xos.h>
++#include <X11/Xmd.h>
+ 
+ /* If EAGAIN and EWOULDBLOCK are distinct errno values, then we check errno
+  * for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index ec58d81388b2e3..7d12492b678e8c 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,10 +1,10 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=23.2.4
-revision=2
+version=24.1.0
+revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
- -Ddri3=true -Dxwayland_eglstream=false -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
+ -Ddri3=true -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
  -Dxkb_output_dir=/var/lib/xkb"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-${version}/xserver-xwayland-${version}.tar.gz"
-checksum=e23fb908c5699c9668cba478082f81d8b8fbc3f744f36821554aa087e4f92e36
+checksum=73b308e1054507e6189de090ec98e5e7ea0dcef3a8fde288dd4a2361ac561c6e
 make_check=no # needs xtest repository
 
 post_install() {

Re: xorg-server-xwayland: update to 24.1.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/50457#issuecomment-2126630147

Comment:
Upstream merge request: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1561

Re: [PR PATCH] [Closed]: xorg-server-xwayland: update to 24.1.0

[abenson]

[-- Attachment #1: Type: text/plain, Size: 639 bytes --]

There's a closed pull request on the void-packages repository

xorg-server-xwayland: update to 24.1.0
https://github.com/void-linux/void-packages/pull/50457

Description:

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl (cross) 
  - i686 (cross) (fix-i686-build.patch added)
  - aarch64 (cross)
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv7l-musl (cross)
  - armv6l (cross)
  - armv6l-musl (cross)