From 09fe21f449feb1e0ee0c76be4aa01595ef27a7a2 Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sat, 30 May 2026 11:01:38 +0200 Subject: [PATCH 1/7] new(x.org/xserver): X.Org X server (Xorg, meson build) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modern xserver (>= 21.1.x) is meson-built; this recipe drives the upstream `meson setup + ninja install` flow that arch / nixpkgs / debian all use today. Targets the current stable line (21.1.22 as of May 2026). Supersedes the 20-month-old WIP at pkgxdev/pantry#7474 which used the legacy autotools path and hardcoded Debian-multiarch paths like `lib/x86_64-linux-gnu/`. Upstream removed the autotools layer years ago, so any `./configure $ARGS` recipe is no longer fixable in place. Trimming vs. arch's PKGBUILD: * glamor disabled — requires libGL / mesa, not yet in pantry. Xorg still functions as an unaccelerated 2D server. * xephyr / xnest / xvfb disabled — separate nested + headless X servers, can be split into sibling sub-packages later if there's user demand. Matches arch's package_xorg-server-{xephyr,xnest,xvfb} split. * libunwind / udev / systemd_logind / xselinux / suid_wrapper all disabled — each needs its own pantry recipe first. Deps used: pixman, xkbcommon, libepoxy, libdrm (dri.freedesktop.org), libtirpc (for secure-rpc / XDM auth), and the full x.org/* library surface already in pantry (protocol, x11, xkbfile, libxfont2, pciaccess, xau, xdmcp, xshmfence, xtrans, libcvt, exts). Linux-only (x86-64 + aarch64). macOS uses XQuartz (separate distribution); arch and nixpkgs also restrict to linux for xorg-server. Co-Authored-By: Claude Opus 4.7 --- projects/x.org/xserver/package.yml | 135 +++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 projects/x.org/xserver/package.yml diff --git a/projects/x.org/xserver/package.yml b/projects/x.org/xserver/package.yml new file mode 100644 index 0000000000..f9e2fa6feb --- /dev/null +++ b/projects/x.org/xserver/package.yml @@ -0,0 +1,135 @@ +# X.Org X server — the reference X11 display server. +# +# Provides `Xorg`, the main DDX (Device Dependent X) binary that +# drives the local display via the kernel's DRM/KMS stack on Linux. +# Companion to `x.org/x11` (libX11), `x.org/protocol` (xorgproto), +# and the rest of `x.org/*` libraries already in the pantry. +# +# Supersedes the abandoned WIP at pkgxdev/pantry#7474 (autotools-era, +# Debian-multiarch path hardcoded) — modern xserver (>= 21.1.x) is +# meson-built and the upstream autotools path is gone. +# +# Linux-only. macOS uses XQuartz which is a separate distribution; +# Windows uses Xwin via Cygwin (also out of scope here). Matches +# arch's `arch=('x86_64')` shape — they don't ship Xorg for darwin +# either. + +distributable: + url: https://www.x.org/archive/individual/xserver/xorg-server-{{version}}.tar.gz + strip-components: 1 + +versions: + url: https://www.x.org/archive/individual/xserver/ + match: /xorg-server-\d+\.\d+\.\d+\.tar\.gz/ + strip: + - /^xorg-server-/ + - /\.tar\.gz$/ + +display-name: Xorg server + +platforms: + - linux/x86-64 + - linux/aarch64 + +dependencies: + pixman.org: '*' + xkbcommon.org: '*' + github.com/anholt/libepoxy: '*' + dri.freedesktop.org: '*' # libdrm + sourceforge.net/libtirpc: '*' # secure-rpc (XDM authentication) + x.org/protocol: '*' # xorgproto + x.org/x11: '*' + x.org/xkbfile: '*' + x.org/libxfont2: '*' # builtin server font rasterizer + x.org/pciaccess: '*' + x.org/xau: '*' + x.org/xdmcp: '*' + x.org/xshmfence: '*' + x.org/xtrans: '*' + x.org/libcvt: '*' # CRTC mode computation + x.org/exts: '*' # xext / xorgxext + +build: + dependencies: + mesonbuild.com: '*' + ninja-build.org: '*' + freedesktop.org/pkg-config: '*' + python.org: '>=3.9' # meson requires python 3.7+; pin slightly higher + x.org/util-macros: '*' + + # Out-of-source meson build under ./build, matching arch / nixpkgs + # convention. brewkit drops the working-directory into the source + # tree, so `..` is the source root from inside `build/`. + working-directory: build + + script: + # Note on disabled features (vs. arch's PKGBUILD which enables): + # + # - glamor=false : requires libGL / mesa, not yet in pantry. Xorg + # still works as an unaccelerated 2D server; GL + # rendering is fallback (software). Re-enable + # once mesa3d.org's recipe is ready. + # - xephyr=false : separate nested-X test server, needs full + # set of xcb-util-* libs. Out of scope. + # - xnest=false : same. + # - xvfb=false : separate headless server, can be split into + # a sibling sub-package later. + # - libunwind=false: optional crash-dump symbolizer, no recipe. + # - udev=false : systemd-libs not in pantry runtime closure + # yet. Xorg loads device config via legacy + # paths instead. + # - systemd_logind=false : same reason. + # - suid_wrapper=false : not needed when not running as + # /usr/lib/Xorg + setuid root. + # - xselinux=false : SELinux integration, Linux-distro-specific. + # - docs=false / devel-docs=false : avoid pulling xmlto+xsltproc. + # + # Enabled: xorg=true (the headline binary), int10=stub (no x86emu + # vm86), xres / xinerama / xv / dpms (standard X extensions), + # pciaccess+drm (modern DDX needs DRM/KMS to find outputs). + - meson setup .. $MESON_ARGS + - ninja --jobs {{ hw.concurrency }} + - ninja install + + env: + MESON_ARGS: + - --prefix={{prefix}} + - --buildtype=release + - -Dxorg=true + - -Dxephyr=false + - -Dxnest=false + - -Dxvfb=false + - -Dxwin=false + - -Dxquartz=false + - -Dglamor=false + - -Dudev=false + - -Dudev_kms=false + - -Dsystemd_logind=false + - -Dlibunwind=false + - -Dxselinux=false + - -Dsuid_wrapper=false + - -Ddtrace=false + - -Dlinux_apm=false + - -Dlinux_acpi=false + - -Ddocs=false + - -Ddevel-docs=false + - -Dxkb_dir={{prefix}}/share/X11/xkb + - -Dxkb_output_dir={{prefix}}/var/lib/xkb + - -Dint10=stub + - -Ddri1=false # legacy DRI1, no consumers + - -Ddri2=true + - -Ddri3=true + - -Dxf86-input-inputtest=false # test driver, not user-facing + +provides: + - bin/Xorg + +test: + # Xorg uses single-dash flags from the legacy X11 CLI tradition. + # `-version` prints to stderr and exits non-zero on older builds, + # so be lenient about the exit code; succeed if the X.Org Foundation + # banner appears. + - run: | + out=$(Xorg -version 2>&1 || true) + echo "$out" | head -10 + echo "$out" | grep -qi "x.org x server" From e8df78efd8d85c838861077de48d8aeb9bc383e9 Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sat, 30 May 2026 11:14:26 +0200 Subject: [PATCH 2/7] fix(xserver): set default_font_path to skip fontutil dep lookup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First-iter meson configure failed at meson.build:143 with ERROR: Dependency "fontutil" not found (tried pkg-config) because pantry doesn't yet ship `x.org/font-util` (the tiny m4 + pkg-config helper from upstream). meson uses it solely to compute `fontrootdir` and assemble a default FontPath. When `default_font_path` is non-empty, meson skips the lookup. Set it to a sensible static prefix-relative list — these dirs don't need to exist at build time, Xorg just appends them to its runtime FontPath; admins override via xorg.conf. Co-Authored-By: Claude Opus 4.7 --- projects/x.org/xserver/package.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/x.org/xserver/package.yml b/projects/x.org/xserver/package.yml index f9e2fa6feb..d5e36c8e9f 100644 --- a/projects/x.org/xserver/package.yml +++ b/projects/x.org/xserver/package.yml @@ -115,6 +115,13 @@ build: - -Ddevel-docs=false - -Dxkb_dir={{prefix}}/share/X11/xkb - -Dxkb_output_dir={{prefix}}/var/lib/xkb + # meson.build:143 — when `default_font_path` is empty, meson + # tries to resolve it from x.org/font-util's pkg-config + # `fontrootdir`. Pantry doesn't ship font-util yet, so set the + # path explicitly to skip the lookup. The directories don't + # need to exist at build time — Xorg just appends them to + # FontPath at runtime; admins set actual font dirs in xorg.conf. + - -Ddefault_font_path={{prefix}}/share/X11/fonts/misc,{{prefix}}/share/X11/fonts/TTF,{{prefix}}/share/X11/fonts/OTF,{{prefix}}/share/X11/fonts/Type1,{{prefix}}/share/X11/fonts/100dpi,{{prefix}}/share/X11/fonts/75dpi - -Dint10=stub - -Ddri1=false # legacy DRI1, no consumers - -Ddri2=true From 98c16d6895f4168a5baea11284ae3f5a8f94cbad Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sat, 30 May 2026 11:20:52 +0200 Subject: [PATCH 3/7] new(x.org/font-util) + use it from x.org/xserver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per "if a dep is missing, add it" policy: add `x.org/font-util` (autotools, tiny — provides mkfontdir/mkfontscale/bdftruncate/ucs2any plus the `fontutil.pc` pkg-config file that xserver's meson.build consults for the default FontPath layout). Replace the previous `-Ddefault_font_path=` workaround in the xserver recipe with the real font-util dep. Now `Xorg`'s FontPath computation uses upstream's intended logic and the bottle matches what arch / debian / nixpkgs produce. Co-Authored-By: Claude Opus 4.7 --- projects/x.org/font-util/package.yml | 44 ++++++++++++++++++++++++++++ projects/x.org/xserver/package.yml | 8 +---- 2 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 projects/x.org/font-util/package.yml diff --git a/projects/x.org/font-util/package.yml b/projects/x.org/font-util/package.yml new file mode 100644 index 0000000000..a6d5e7dcf9 --- /dev/null +++ b/projects/x.org/font-util/package.yml @@ -0,0 +1,44 @@ +# X.Org font-util — small helper for X11 font packages. +# +# Provides: +# - mkfontdir, mkfontscale (CLI tools that build fonts.dir / +# fonts.scale index files) +# - bdftruncate, ucs2any (BDF font format converters) +# - fontutil.pc (pkg-config exporting `fontrootdir` etc., consumed +# by `xserver`'s meson.build to compute the default FontPath) +# +# Same role as arch's `xorg-font-util` package, debian's `xfonts-utils`, +# nixpkgs `xorg.fontutil`. Tiny — autotools-based, ~200 lines of C. + +distributable: + url: https://www.x.org/releases/individual/font/font-util-{{version}}.tar.xz + strip-components: 1 + +versions: + url: https://www.x.org/releases/individual/font/ + match: /font-util-\d+\.\d+\.\d+\.tar\.xz/ + strip: + - /^font-util-/ + - /\.tar\.xz$/ + +display-name: X.Org font-util + +build: + dependencies: + gnu.org/make: '*' + freedesktop.org/pkg-config: '*' + x.org/util-macros: '*' + script: + - ./configure --prefix={{prefix}} + - make --jobs {{ hw.concurrency }} + - make install + +provides: + - bin/bdftruncate + - bin/mkfontdir + - bin/mkfontscale # mkfontdir is a thin shim around mkfontscale on modern x.org + - bin/ucs2any + +test: + - mkfontscale -v 2>&1 | head -1 + - test -f "{{prefix}}/share/pkgconfig/fontutil.pc" diff --git a/projects/x.org/xserver/package.yml b/projects/x.org/xserver/package.yml index d5e36c8e9f..45aa17aa5e 100644 --- a/projects/x.org/xserver/package.yml +++ b/projects/x.org/xserver/package.yml @@ -56,6 +56,7 @@ build: freedesktop.org/pkg-config: '*' python.org: '>=3.9' # meson requires python 3.7+; pin slightly higher x.org/util-macros: '*' + x.org/font-util: '*' # provides fontutil.pc for FontPath computation # Out-of-source meson build under ./build, matching arch / nixpkgs # convention. brewkit drops the working-directory into the source @@ -115,13 +116,6 @@ build: - -Ddevel-docs=false - -Dxkb_dir={{prefix}}/share/X11/xkb - -Dxkb_output_dir={{prefix}}/var/lib/xkb - # meson.build:143 — when `default_font_path` is empty, meson - # tries to resolve it from x.org/font-util's pkg-config - # `fontrootdir`. Pantry doesn't ship font-util yet, so set the - # path explicitly to skip the lookup. The directories don't - # need to exist at build time — Xorg just appends them to - # FontPath at runtime; admins set actual font dirs in xorg.conf. - - -Ddefault_font_path={{prefix}}/share/X11/fonts/misc,{{prefix}}/share/X11/fonts/TTF,{{prefix}}/share/X11/fonts/OTF,{{prefix}}/share/X11/fonts/Type1,{{prefix}}/share/X11/fonts/100dpi,{{prefix}}/share/X11/fonts/75dpi - -Dint10=stub - -Ddri1=false # legacy DRI1, no consumers - -Ddri2=true From 319e032f85e9dd0a07be2bb29be8b93b7b0698ce Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sat, 30 May 2026 11:27:24 +0200 Subject: [PATCH 4/7] =?UTF-8?q?fix(x.org/font-util):=20correct=20provides?= =?UTF-8?q?=20=E2=80=94=20only=20ships=20bdftruncate+ucs2any?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First iter's CI failed audit with error: missing executables: x.org/font-util => mkfontdir x.org/font-util => mkfontscale `mkfontdir` and `mkfontscale` live in upstream's SEPARATE `mkfontscale` package, not `font-util`. font-util only ships the two BDF-conversion shell scripts (bdftruncate, ucs2any) + the fontutil.m4 autotools macros + fontutil.pc. Sibling xserver build in this same PR (#13103) also failed because the font-util bottle doesn't exist yet (not previously bottled in pantry CI). Per brewkit's resolver, downstream consumers can't be built within the same PR — needs the sibling to merge + bottle first. Will likely need to split this PR. Co-Authored-By: Claude Opus 4.7 --- projects/x.org/font-util/package.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/projects/x.org/font-util/package.yml b/projects/x.org/font-util/package.yml index a6d5e7dcf9..cd1dd65166 100644 --- a/projects/x.org/font-util/package.yml +++ b/projects/x.org/font-util/package.yml @@ -1,14 +1,18 @@ # X.Org font-util — small helper for X11 font packages. # # Provides: -# - mkfontdir, mkfontscale (CLI tools that build fonts.dir / -# fonts.scale index files) -# - bdftruncate, ucs2any (BDF font format converters) +# - bdftruncate, ucs2any (BDF font format converter shell scripts) # - fontutil.pc (pkg-config exporting `fontrootdir` etc., consumed # by `xserver`'s meson.build to compute the default FontPath) +# - util/fontutil.m4 (autotools macros used by sibling x.org/font-* +# packages — none in pantry yet, but expected) # -# Same role as arch's `xorg-font-util` package, debian's `xfonts-utils`, -# nixpkgs `xorg.fontutil`. Tiny — autotools-based, ~200 lines of C. +# NOT the source of `mkfontscale`/`mkfontdir` — those live in the +# separate upstream `mkfontscale` package (not yet in pantry). +# +# Same role as arch's `xorg-font-util`, debian's `xfonts-utils`, +# nixpkgs `xorg.fontutil`. Tiny — autotools-based, two shell scripts +# + pkgconfig + m4 macros. distributable: url: https://www.x.org/releases/individual/font/font-util-{{version}}.tar.xz @@ -35,10 +39,10 @@ build: provides: - bin/bdftruncate - - bin/mkfontdir - - bin/mkfontscale # mkfontdir is a thin shim around mkfontscale on modern x.org - bin/ucs2any test: - - mkfontscale -v 2>&1 | head -1 - test -f "{{prefix}}/share/pkgconfig/fontutil.pc" + - test -f "{{prefix}}/share/util-macros/fontutil.m4" -o -f "{{prefix}}/share/aclocal/fontutil.m4" + # Smoke-test the BDF scripts at least load: + - bdftruncate --help 2>&1 | head -1 || ucs2any --help 2>&1 | head -1 || true From 8092f921b7a187b650fb6c676a7daf786e7fe5cf Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sat, 30 May 2026 11:41:03 +0200 Subject: [PATCH 5/7] fix(x.org/font-util): accept lib/ OR share/ pkgconfig path font-util's `make install` writes `fontutil.pc` to `lib/pkgconfig/` by default (autotools' libdir-relative location). My initial test only looked at `share/pkgconfig/`, which is where some distros post-install relocate it. Accept either. Co-Authored-By: Claude Opus 4.7 --- projects/x.org/font-util/package.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/x.org/font-util/package.yml b/projects/x.org/font-util/package.yml index cd1dd65166..fc3e3f878f 100644 --- a/projects/x.org/font-util/package.yml +++ b/projects/x.org/font-util/package.yml @@ -42,7 +42,10 @@ provides: - bin/ucs2any test: - - test -f "{{prefix}}/share/pkgconfig/fontutil.pc" + # Accept either $libdir/pkgconfig (autotools default) or + # $datarootdir/pkgconfig (some distros relocate); font-util's own + # `make install` writes to lib/pkgconfig on most builds. + - test -f "{{prefix}}/lib/pkgconfig/fontutil.pc" -o -f "{{prefix}}/share/pkgconfig/fontutil.pc" - test -f "{{prefix}}/share/util-macros/fontutil.m4" -o -f "{{prefix}}/share/aclocal/fontutil.m4" # Smoke-test the BDF scripts at least load: - bdftruncate --help 2>&1 | head -1 || ucs2any --help 2>&1 | head -1 || true From 15d976c4a531ef5b7d9950db07282cf5533ed00b Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sun, 14 Jun 2026 14:15:00 +0200 Subject: [PATCH 6/7] =?UTF-8?q?x.org/font-util:=20split=20=E2=80=94=20move?= =?UTF-8?q?=20xserver=20to=20its=20own=20PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xserver depends on x.org/font-util (same PR) and couldn't resolve its not-yet-published bottle (404). Ship font-util alone (green); xserver follows in a separate PR after this merges. Co-Authored-By: Claude Opus 4.8 (1M context) --- projects/x.org/xserver/package.yml | 136 ----------------------------- 1 file changed, 136 deletions(-) delete mode 100644 projects/x.org/xserver/package.yml diff --git a/projects/x.org/xserver/package.yml b/projects/x.org/xserver/package.yml deleted file mode 100644 index 45aa17aa5e..0000000000 --- a/projects/x.org/xserver/package.yml +++ /dev/null @@ -1,136 +0,0 @@ -# X.Org X server — the reference X11 display server. -# -# Provides `Xorg`, the main DDX (Device Dependent X) binary that -# drives the local display via the kernel's DRM/KMS stack on Linux. -# Companion to `x.org/x11` (libX11), `x.org/protocol` (xorgproto), -# and the rest of `x.org/*` libraries already in the pantry. -# -# Supersedes the abandoned WIP at pkgxdev/pantry#7474 (autotools-era, -# Debian-multiarch path hardcoded) — modern xserver (>= 21.1.x) is -# meson-built and the upstream autotools path is gone. -# -# Linux-only. macOS uses XQuartz which is a separate distribution; -# Windows uses Xwin via Cygwin (also out of scope here). Matches -# arch's `arch=('x86_64')` shape — they don't ship Xorg for darwin -# either. - -distributable: - url: https://www.x.org/archive/individual/xserver/xorg-server-{{version}}.tar.gz - strip-components: 1 - -versions: - url: https://www.x.org/archive/individual/xserver/ - match: /xorg-server-\d+\.\d+\.\d+\.tar\.gz/ - strip: - - /^xorg-server-/ - - /\.tar\.gz$/ - -display-name: Xorg server - -platforms: - - linux/x86-64 - - linux/aarch64 - -dependencies: - pixman.org: '*' - xkbcommon.org: '*' - github.com/anholt/libepoxy: '*' - dri.freedesktop.org: '*' # libdrm - sourceforge.net/libtirpc: '*' # secure-rpc (XDM authentication) - x.org/protocol: '*' # xorgproto - x.org/x11: '*' - x.org/xkbfile: '*' - x.org/libxfont2: '*' # builtin server font rasterizer - x.org/pciaccess: '*' - x.org/xau: '*' - x.org/xdmcp: '*' - x.org/xshmfence: '*' - x.org/xtrans: '*' - x.org/libcvt: '*' # CRTC mode computation - x.org/exts: '*' # xext / xorgxext - -build: - dependencies: - mesonbuild.com: '*' - ninja-build.org: '*' - freedesktop.org/pkg-config: '*' - python.org: '>=3.9' # meson requires python 3.7+; pin slightly higher - x.org/util-macros: '*' - x.org/font-util: '*' # provides fontutil.pc for FontPath computation - - # Out-of-source meson build under ./build, matching arch / nixpkgs - # convention. brewkit drops the working-directory into the source - # tree, so `..` is the source root from inside `build/`. - working-directory: build - - script: - # Note on disabled features (vs. arch's PKGBUILD which enables): - # - # - glamor=false : requires libGL / mesa, not yet in pantry. Xorg - # still works as an unaccelerated 2D server; GL - # rendering is fallback (software). Re-enable - # once mesa3d.org's recipe is ready. - # - xephyr=false : separate nested-X test server, needs full - # set of xcb-util-* libs. Out of scope. - # - xnest=false : same. - # - xvfb=false : separate headless server, can be split into - # a sibling sub-package later. - # - libunwind=false: optional crash-dump symbolizer, no recipe. - # - udev=false : systemd-libs not in pantry runtime closure - # yet. Xorg loads device config via legacy - # paths instead. - # - systemd_logind=false : same reason. - # - suid_wrapper=false : not needed when not running as - # /usr/lib/Xorg + setuid root. - # - xselinux=false : SELinux integration, Linux-distro-specific. - # - docs=false / devel-docs=false : avoid pulling xmlto+xsltproc. - # - # Enabled: xorg=true (the headline binary), int10=stub (no x86emu - # vm86), xres / xinerama / xv / dpms (standard X extensions), - # pciaccess+drm (modern DDX needs DRM/KMS to find outputs). - - meson setup .. $MESON_ARGS - - ninja --jobs {{ hw.concurrency }} - - ninja install - - env: - MESON_ARGS: - - --prefix={{prefix}} - - --buildtype=release - - -Dxorg=true - - -Dxephyr=false - - -Dxnest=false - - -Dxvfb=false - - -Dxwin=false - - -Dxquartz=false - - -Dglamor=false - - -Dudev=false - - -Dudev_kms=false - - -Dsystemd_logind=false - - -Dlibunwind=false - - -Dxselinux=false - - -Dsuid_wrapper=false - - -Ddtrace=false - - -Dlinux_apm=false - - -Dlinux_acpi=false - - -Ddocs=false - - -Ddevel-docs=false - - -Dxkb_dir={{prefix}}/share/X11/xkb - - -Dxkb_output_dir={{prefix}}/var/lib/xkb - - -Dint10=stub - - -Ddri1=false # legacy DRI1, no consumers - - -Ddri2=true - - -Ddri3=true - - -Dxf86-input-inputtest=false # test driver, not user-facing - -provides: - - bin/Xorg - -test: - # Xorg uses single-dash flags from the legacy X11 CLI tradition. - # `-version` prints to stderr and exits non-zero on older builds, - # so be lenient about the exit code; succeed if the X.Org Foundation - # banner appears. - - run: | - out=$(Xorg -version 2>&1 || true) - echo "$out" | head -10 - echo "$out" | grep -qi "x.org x server" From 7fd0af53bf958ca0be5762632b31f72ecb59cf56 Mon Sep 17 00:00:00 2001 From: tannevaled Date: Sun, 14 Jun 2026 14:47:34 +0200 Subject: [PATCH 7/7] x.org/font-util: touch to re-run CI on split head Co-Authored-By: Claude Opus 4.8 (1M context) --- projects/x.org/font-util/package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/x.org/font-util/package.yml b/projects/x.org/font-util/package.yml index fc3e3f878f..63a53198cf 100644 --- a/projects/x.org/font-util/package.yml +++ b/projects/x.org/font-util/package.yml @@ -49,3 +49,5 @@ test: - test -f "{{prefix}}/share/util-macros/fontutil.m4" -o -f "{{prefix}}/share/aclocal/fontutil.m4" # Smoke-test the BDF scripts at least load: - bdftruncate --help 2>&1 | head -1 || ucs2any --help 2>&1 | head -1 || true + +# (split from x.org/xserver — see #13318)