From 4407e14dfcbfef11ec70bd610a7a1f592b223319 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Sun, 3 May 2026 03:56:33 +0900
Subject: [PATCH] internal/rosa/x: migrate to xorgproto

This is much cleaner than the many protocol packages.

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 internal/rosa/all.go |  2 +-
 internal/rosa/x.go   | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/internal/rosa/all.go b/internal/rosa/all.go
index dd558b48..3caf543e 100644
--- a/internal/rosa/all.go
+++ b/internal/rosa/all.go
@@ -167,7 +167,7 @@ const (
 	XCBProto
 	XDGDBusProxy
 	XZ
-	Xproto
+	XorgProto
 	Zlib
 	Zstd
 
diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index 37fbba27..2c3c78fc 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -58,19 +58,18 @@ func init() {
 	}
 }
 
-func (t Toolchain) newXproto() (pkg.Artifact, string) {
+func (t Toolchain) newXorgProto() (pkg.Artifact, string) {
 	const (
-		version  = "7.0.31"
-		checksum = "Cm69urWY5RctKpR78eGzuwrjDEfXGkvHRdodj6sjypOGy5FF4-lmnUttVHYV1ydg"
+		version  = "2025.1"
+		checksum = "pTwJiBJHKA6Rgm3cVDXy1lyvXNIUzTRaukvvYdk1xWoJ_1G-Dfjm9MyewuyIjoHz"
 	)
-	return t.NewPackage("xproto", version, newTar(
-		"https://www.x.org/releases/individual/proto/"+
-			"xproto-"+version+".tar.bz2",
+	return t.NewPackage("xorgproto", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/proto/xorgproto",
+		"xorgproto-"+version,
 		checksum,
-		pkg.TarBzip2,
 	), nil, &MakeHelper{
-		// ancient configure script
-		Generate: "autoreconf -if",
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
 	},
 		Automake,
 		PkgConfig,
@@ -79,14 +78,14 @@ func (t Toolchain) newXproto() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Xproto] = Metadata{
-		f: Toolchain.newXproto,
+	artifactsM[XorgProto] = Metadata{
+		f: Toolchain.newXorgProto,
 
-		Name:        "xproto",
+		Name:        "xorgproto",
 		Description: "X Window System unified protocol definitions",
 		Website:     "https://gitlab.freedesktop.org/xorg/proto/xorgproto",
 
-		ID: 13650,
+		ID: 17190,
 	}
 }
 
@@ -109,7 +108,7 @@ func (t Toolchain) newLibXau() (pkg.Artifact, string) {
 		PkgConfig,
 
 		utilMacros,
-		Xproto,
+		XorgProto,
 	), version
 }
 func init() {
@@ -121,7 +120,7 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxau",
 
 		Dependencies: P{
-			Xproto,
+			XorgProto,
 		},
 
 		ID: 1765,