From f8722787183efe30683e1ef84d04aeb9d51c7406 Mon Sep 17 00:00:00 2001
From: Zeckmathederg <zeckmaisreal@gmail.com>
Date: Sun, 23 Jun 2024 22:41:34 -0600
Subject: [PATCH] Made a couple of changes involving libxml2.

Moved libxml2 from Wayland -> Basic X11 Software; added libxml2 as a RDEP to spirv-llvm-translator.
---
 introduction/welcome/changelog.xml              | 3 +++
 shareddeps/dps/{wl => basicx/other}/libxml2.xml | 4 ++--
 shareddeps/drivers/spirv-llvm-translator.xml    | 1 +
 shareddeps/sdintro.xml                          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename shareddeps/dps/{wl => basicx/other}/libxml2.xml (98%)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index aa6d8db789..3a4841f82a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,9 @@
     <listitem>
       <para>June 23rd, 2024</para>
       <itemizedlist>
+	<listitem>
+          <para>[Zeckmathederg] - Made a couple of changes involving libxml2.</para>
+        </listitem>
         <listitem>
           <para>[Zeckmathederg] - Adjusted wget download wget-list command.</para>
         </listitem>
diff --git a/shareddeps/dps/wl/libxml2.xml b/shareddeps/dps/basicx/other/libxml2.xml
similarity index 98%
rename from shareddeps/dps/wl/libxml2.xml
rename to shareddeps/dps/basicx/other/libxml2.xml
index 1bc76b1d74..3027629579 100644
--- a/shareddeps/dps/wl/libxml2.xml
+++ b/shareddeps/dps/basicx/other/libxml2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  <!ENTITY % general-entities SYSTEM "../../../../general.ent">
   %general-entities;
 
   <!-- Also update the download, md5, size entities in libxml2py2.xml -->
@@ -89,7 +89,7 @@ sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</userinput></screen>
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../../xincludes/static-libraries.xml"/>
+    href="../../../../xincludes/static-libraries.xml"/>
 
     <para>
       <parameter>--with-history</parameter>: This switch enables
diff --git a/shareddeps/drivers/spirv-llvm-translator.xml b/shareddeps/drivers/spirv-llvm-translator.xml
index 1ace3175d7..b438ffbd44 100644
--- a/shareddeps/drivers/spirv-llvm-translator.xml
+++ b/shareddeps/drivers/spirv-llvm-translator.xml
@@ -45,6 +45,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="cmake"/>,
+      <xref linkend="libxml2"/>,
       <xref linkend="llvm"/> (with Clang),
       <xref linkend="spirv-headers"/>, and
       <xref linkend="spirv-tools"/>
diff --git a/shareddeps/sdintro.xml b/shareddeps/sdintro.xml
index b659069c9b..e93ab8bfa5 100644
--- a/shareddeps/sdintro.xml
+++ b/shareddeps/sdintro.xml
@@ -68,6 +68,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/nettle.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/gnutls.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/pixman.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/libxml2.xml"/>
 
   <!-- GRAPHICS APIS -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gfxapi/gfxapidummy.xml"/>
@@ -124,7 +125,6 @@
   <!-- WAYLAND -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/wldummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/libxml2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/wayland-protocols.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/xwayland.xml"/>