From 3573a39ccf2ca68eb54279d59472153cd195b635 Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Thu, 16 May 2024 11:14:11 +0300
Subject: extra/xorg-server: Delete old and backport new patch

---
 ...ephyr-Fix-incompatible-pointer-type-build-error.patch | Bin 0 -> 2709 bytes
 extra/xorg-server/PKGBUILD                               |  15 +++++----------
 .../xorg-server-21.1.3-probed-mode-name-not-null.patch   | Bin 854 -> 0 bytes
 3 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch
 delete mode 100644 extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch

diff --git a/extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch b/extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch
new file mode 100644
index 00000000..452723ee
Binary files /dev/null and b/extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch differ
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index f30c30dd..68846353 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,18 +1,13 @@
-# backport of ed11c4d443ad2e82512df64358d38008e0ee7693 for initializing probed mode line names
-source+=('xorg-server-21.1.3-probed-mode-name-not-null.patch')
-sha512sums+=('d721fad70b417b40f6b29e77b21c530b8f6d91c37e65c1a82c2cfcde5012adc17022ac0faa50ca587583aab6f6a5e5bdcdc68e36ece6ada766813aca1ab8b76d')
+source+=('0001-ephyr-Fix-incompatible-pointer-type-build-error.patch')
+sha512sums+=('5d6e2063d2e4d97dd2883b11ab7953e8ddedf5389b2e510e85ff199eebb86ad43c74ab88dc9258290bff91ed7c6ceefc0f90b148846b9703b1ce7c782905424a')
 
 eval "$(
-  {
-    declare -f prepare || \
-    printf 'prepare() {\n}\n'
-  } \
-  | sed '
-    $i cd "$srcdir/$pkgname-$pkgver" \
-       patch -Np1 -i "$srcdir/xorg-server-21.1.3-probed-mode-name-not-null.patch"
+  declare -f prepare | sed '
+    4i patch -Np1 -i "$srcdir/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch" || true
   '
 )"
 
+
 # disabling LTO on i486 as enabling it leads to all kind of link errors
 if [ "${CARCH}" = "i486" ]; then
   eval "$(
diff --git a/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch b/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch
deleted file mode 100644
index 77d5de33..00000000
Binary files a/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch and /dev/null differ
-- 
cgit v1.2.3-54-g00ecf