From ae3304263f4221176aff148ee60e38c875bc1bc2 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Sat, 1 Nov 2025 19:29:26 +0200
Subject: [PATCH] Update package version to 24.1.9

---
 pkg.info  | 35 ++++++++++++++++++++++++++++++++---
 source.sh | 21 ++++-----------------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/pkg.info b/pkg.info
index 205a616..d0c7754 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,9 +1,38 @@
 name: xorg-xwayland
 description: X server for running applications under Wayland
-version: 24.1.8
+version: 24.1.9
+revision: 1
 url: https://xorg.freedesktop.org/
 license: BSD-3-Clause,HPND,HPND-sell-variant,ICU,ISC,LicenseRef-Adobe-Display-PostScript,LicenseRef-DEC-3-Clause,LicenseRef-HPND-sell-MIT-disclaimer-xserver,MIT,MIT-open-group,NTP,SGI-B-2.0,SMLNJ,X11,X11-distribute-modifications-variant
 architecture: any
-depends: ["glibc","libdecor","libdrm","libepoxy","libglvnd","libtirpc","libxau","libxcvt","libxfont2","libxshmfence","mesa","nettle","pixman","wayland","xorg-server"]
-make_depends: ["dbus","elogind","libxkbfile","meson","wayland-protocols","xorg-fonts-util","xorgproto","xtrans"]
 type: source
+depends:
+  - glibc
+  - libdecor
+  - libdrm
+  - libepoxy
+  - libglvnd
+  - libtirpc
+  - libxau
+  - libxcvt
+  - libxfont2
+  - libxshmfence
+  - mesa
+  - nettle
+  - pixman
+  - wayland
+  - xorg-server
+make_depends:
+  - dbus
+  - elogind
+  - libxkbfile
+  - meson
+  - wayland-protocols
+  - xorg-fonts-util
+  - xorgproto
+  - xtrans
+downloads:
+  - url: https://www.x.org/pub/individual/xserver/xwayland-${BPM_PKG_VERSION}.tar.xz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: f297af27a84508db9b80d1cbbcc69c3801da38eb64c72f3b5b50f582459afdd0
diff --git a/source.sh b/source.sh
index e1c12dc..6aa02cc 100644
--- a/source.sh
+++ b/source.sh
@@ -2,22 +2,9 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://www.x.org/pub/individual/xserver/xwayland-${BPM_PKG_VERSION}.tar.xz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  mkdir build
-  cd build
-
   meson setup --prefix=/usr       \
               --libdir=/usr/lib   \
               --buildtype=release \
@@ -26,19 +13,19 @@ build() {
               -Ddri3=true         \
               -Dglamor=true       \
               -Dlibdecor=true     \
-              -Dxkb_output_dir=/var/lib/xkb ..
-  ninja
+              -Dxkb_output_dir=/var/lib/xkb build
+  meson compile -C build
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  cd build
-  DESTDIR="$BPM_OUTPUT" ninja install
+  meson install -C build --destdir="$BPM_OUTPUT"
 
   rm "$BPM_OUTPUT"/usr/lib/xorg/protocol.txt
   rmdir "$BPM_OUTPUT"/usr/lib/xorg
   rm "$BPM_OUTPUT"/usr/share/man/man1/Xserver.1
 
+  # Install package license
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/xorg-xwayland/COPYING
 }