From 7387bfac6303543e4781937108e522ded4096b51 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 3 May 2025 18:30:06 -0600
Subject: [PATCH] libxaw, libxext, xextproto: move, update, and fix compilation

---
 recipes/wip/libs/other/libxaw/recipe.toml  | 11 -----------
 recipes/wip/libs/other/libxext/recipe.toml |  5 -----
 recipes/wip/x11/libxaw/recipe.toml         | 19 +++++++++++++++++++
 recipes/wip/x11/libxext/recipe.toml        | 22 ++++++++++++++++++++++
 recipes/wip/x11/xextproto/recipe.toml      | 14 ++++++++++++++
 5 files changed, 55 insertions(+), 16 deletions(-)
 delete mode 100644 recipes/wip/libs/other/libxaw/recipe.toml
 delete mode 100644 recipes/wip/libs/other/libxext/recipe.toml
 create mode 100644 recipes/wip/x11/libxaw/recipe.toml
 create mode 100644 recipes/wip/x11/libxext/recipe.toml
 create mode 100644 recipes/wip/x11/xextproto/recipe.toml

diff --git a/recipes/wip/libs/other/libxaw/recipe.toml b/recipes/wip/libs/other/libxaw/recipe.toml
deleted file mode 100644
index 507f16fb7..000000000
--- a/recipes/wip/libs/other/libxaw/recipe.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-#TODO make dependencies work
-[source]
-tar = "https://www.x.org/releases/individual/lib/libXaw-1.0.15.tar.xz"
-[build]
-template = "configure"
-dependencies = [
-    "libx11",
-    "x11proto",
-    "libxext",
-    "libxmu",
-]
\ No newline at end of file
diff --git a/recipes/wip/libs/other/libxext/recipe.toml b/recipes/wip/libs/other/libxext/recipe.toml
deleted file mode 100644
index bccc86cc3..000000000
--- a/recipes/wip/libs/other/libxext/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-#TODO missing dependencies
-[source]
-tar = "https://www.x.org/releases/individual/lib/libXext-1.3.5.tar.xz"
-[build]
-template = "configure"
diff --git a/recipes/wip/x11/libxaw/recipe.toml b/recipes/wip/x11/libxaw/recipe.toml
new file mode 100644
index 000000000..57982d940
--- /dev/null
+++ b/recipes/wip/x11/libxaw/recipe.toml
@@ -0,0 +1,19 @@
+[source]
+tar = "https://www.x.org/releases/individual/lib/libXaw-1.0.16.tar.xz"
+blake3 = "f2a3b4955508dc7a576ad473119562b724f7936d312c85c79cb32f614c60f0c5"
+script = """
+DYNAMIC_INIT
+autotools_recursive_regenerate
+"""
+
+[build]
+dependencies = [
+    "libx11",
+    "libxt",
+    "x11proto",
+]
+template = "custom"
+script = """
+DYNAMIC_INIT
+cookbook_configure
+"""
diff --git a/recipes/wip/x11/libxext/recipe.toml b/recipes/wip/x11/libxext/recipe.toml
new file mode 100644
index 000000000..36a525dc7
--- /dev/null
+++ b/recipes/wip/x11/libxext/recipe.toml
@@ -0,0 +1,22 @@
+[source]
+tar = "https://www.x.org/releases/individual/lib/libXext-1.3.6.tar.xz"
+blake3 = "4c24887ba3913728f3c0be945006f6babbc2c44c8118d4b1ca5366294e3f4406"
+script = """
+DYNAMIC_INIT
+autotools_recursive_regenerate
+"""
+
+[build]
+dependencies = [
+    "libpthread-stubs",
+    "libx11",
+    "libxau",
+    "libxcb",
+    "x11proto",
+    "xextproto",
+]
+template = "custom"
+script = """
+DYNAMIC_INIT
+cookbook_configure --enable-malloc0returnsnull
+"""
diff --git a/recipes/wip/x11/xextproto/recipe.toml b/recipes/wip/x11/xextproto/recipe.toml
new file mode 100644
index 000000000..8d83a40c2
--- /dev/null
+++ b/recipes/wip/x11/xextproto/recipe.toml
@@ -0,0 +1,14 @@
+[source]
+tar = "https://www.x.org/releases/individual/proto/xextproto-7.3.0.tar.bz2"
+blake3 = "08cdd8b3838da9c99176778c925327aa35661d41d0e4d7458a378f14a42172c0"
+script = """
+DYNAMIC_INIT
+autotools_recursive_regenerate
+"""
+
+[build]
+template = "custom"
+script = """
+DYNAMIC_INIT
+cookbook_configure
+"""