[PR PATCH] Upgrade xorg server and xwayland

[PR PATCH] Upgrade xorg server and xwayland

[Dieken]

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

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

https://github.com/Dieken/void-packages upgrade-xorg-server-and-xwayland
https://github.com/void-linux/void-packages/pull/43201

Upgrade xorg server and xwayland
Fixed https://github.com/void-linux/void-packages/issues/43174

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-upgrade-xorg-server-and-xwayland-43201.patch --]
[-- Type: text/x-diff, Size: 2362 bytes --]

From bc4a49a698083e70a5acb32562e17448fb9e7f8d Mon Sep 17 00:00:00 2001
From: Yubao Liu <yubao.liu@gmail.com>
Date: Sun, 2 Apr 2023 19:54:17 +0800
Subject: [PATCH 1/2] xorg-server: update to 21.1.8

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index b4d24434a24f..d7514f2735bf 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=21.1.7
+version=21.1.8
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -24,7 +24,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb
+checksum=38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-25_1 xf86-video-modesetting-1_1"

From 93972411bf93f6e43d98d32e62c362439b2b305a Mon Sep 17 00:00:00 2001
From: Yubao Liu <yubao.liu@gmail.com>
Date: Sun, 2 Apr 2023 19:54:36 +0800
Subject: [PATCH 2/2] xorg-server-xwayland: update to 23.1.1

---
 srcpkgs/xorg-server-xwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 1b3b6b33d5d6..d3268e282961 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=23.1.0
+version=23.1.1
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
@@ -16,7 +16,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=0f9e1a1e2b628149565707edceb4150b8841d09709590824023513fdf4cad3ec
+checksum=5a10b26c62495435449f9bd5aad3db8ad29fe8eccd7cf7324011cd981d82dbf0
 make_check=no # needs xtest repository
 
 post_install() {

Re: Upgrade xorg server and xwayland

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/43201#issuecomment-1493324713

Comment:
please separate these two commits to two pull requests, they don't depend on each other and can be merged separately 

Re: Upgrade xorg server and xwayland

[Dieken]

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

New comment by Dieken on void-packages repository

https://github.com/void-linux/void-packages/pull/43201#issuecomment-1493349000

Comment:
superseded by https://github.com/void-linux/void-packages/pull/43210  and https://github.com/void-linux/void-packages/pull/43211

Re: [PR PATCH] [Closed]: Upgrade xorg server and xwayland

[Dieken]

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

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

Upgrade xorg server and xwayland
https://github.com/void-linux/void-packages/pull/43201

Description:
Fixed https://github.com/void-linux/void-packages/issues/43174

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)