I hate GI... Added, begrudgingly.

introduction/welcome/changelog.xml

@@ -42,6 +42,9 @@
     <listitem>
       <para>October 19th, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[Zeckmathederg] - I hate GI... Added, begrudgingly.</para>
+        </listitem>
         <listitem>
           <para>[Zeckmathederg] - Mesa: Fixed a command typo.</para>
         </listitem>

kernel-config/kernel.version

@@ -1 +1 @@
-6.11.1
+6.11.3

packages.ent

@@ -109,6 +109,7 @@
 <!ENTITY duktape-version              "2.7.0">
 <!ENTITY glib2-minor                  "2.82">
 <!ENTITY glib2-version                "&glib2-minor;.2">
+<!ENTITY gobject-introspection-version "1.82.0">
 <!ENTITY shared-mime-info-version     "2.4">
 <!ENTITY desktop-file-utils-version   "0.27">
 <!ENTITY polkit-version               "125">

shareddeps/audio/pulseaudio.xml

@@ -50,7 +50,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libsndfile"/>
+      <xref linkend="libsndfile"/> and <xref linkend="mesonfiles"/> (for lib32)
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -180,9 +180,8 @@ ldconfig</userinput></screen>
       commands:
     </para>
 
-<screen><userinput>CC="gcc -m32" CXX="g++ -m32"         \
+<screen><userinput>meson setup --cross-file lib32       \
-PKG_CONFIG_PATH=/usr/lib32/pkgconfig \
+            --prefix=/usr            \
-meson setup --prefix=/usr            \
             --libdir=/usr/lib32      \
             --buildtype=release      \
             -D database=gdbm         \

shareddeps/checkpoint/whatnow.xml

@@ -60,7 +60,7 @@
         command as the <systemitem class="username">root</systemitem> user:
       </para>
 
-      <screen><userinput>nvidia-xconfig</userinput></screen>
+      <screen role="root"><userinput>nvidia-xconfig</userinput></screen>
 
       <important>
         <para>
@@ -85,9 +85,21 @@
 
       <para>
         If you have an integrated graphics card (being either AMD or Intel) and
-        a discrete graphics card (being NVIDIA), check the Arch Wiki page on
+        a discrete graphics card (being NVIDIA), run the following as the
-        <ulink url="https://wiki.archlinux.org/title/NVIDIA_Optimus">NVIDIA
+        &root; user:
-        OPTIMUS</ulink>. Please install the drivers for both cards.
+      </para>
+
+      <screen role="root"><userinput>nvidia-xconfig --prime</userinput></screen>
+
+      <para>
+        It will then say you will have to run a few commands. While in a TTY,
+        put those commands into your <filename>~/.xinitrc</filename> file, or
+        else when you start Xorg you will be greeted
+        with a black screen. You can also put the commands in a different
+        script, use the keybind to open a terminal, execute the script while
+        blind, and the graphics should appear like normal. Running the commands
+        in a TTY will complain that it is unable to find any screens. Make sure
+        sure you have installed drivers for both your iGPU and dGPU.
       </para>
 
     </sect3>

shareddeps/dps/basicx/other/harfbuzz.xml

@@ -27,8 +27,6 @@
       shaping engine.
     </para>
 
-    
-
     <itemizedlist spacing="compact">
       <listitem>
         <para>
@@ -41,69 +39,23 @@
         </para>
       </listitem>
     </itemizedlist>
-<!--
+    
     <bridgehead renderas="sect3">HarfBuzz Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="glib2"/> (required for Pango; GObject Introspection
       required for building GNOME),
-      <xref role="first" linkend="graphite2"/> (required for building
-        <xref role="nodep" linkend="texlive"/> or
-        <xref role="nodep" linkend="libreoffice"/> with system harfbuzz),
       <xref linkend="icu"/>, and
-      <xref role="first" linkend="freetype2"/>
+      <xref role="first" linkend="freetype2-pass1"/>
-      (after harfbuzz is installed, reinstall freetype)
+      <xref linkend="mesonfiles"/> (for lib32)
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/> (circular: build cairo and all its recommended
-      dependencies, including harfbuzz, first, then rebuild harfbuzz if the
-      cairo backend is needed),
-      <xref linkend="git"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://pypi.org/project/FontTools/">FontTools</ulink>
-      (Python 3 module, for the test suite),
-      <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>,
-      and <ulink url="https://github.com/bytecodealliance/wasm-micro-runtime">wasm-micro-runtime</ulink>
-    </para>
--->
-
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of HarfBuzz</title>
 
-    <important>
-      <para>
-        While <ulink url="&blfs-svn;/general/glib2.html">Glib</ulink> support
-        can be compiled for this package, GLFS does not have instructions for
-        it. If you have already installed Glib and did not install the 32-bit
-        version, then you will need to move the pkgconfig file out of the way.
-        This is because <command>pkgconf</command> will report that glib-2.0
-        is installed despite the fact that the 32-bit version is not installed,
-        leading to a linker error as a 64-bit library cannot be linked against
-        a 32-bit application. If this applies to you,
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-<screen role="root"><userinput>mv /usr/lib/pkgconfig/glib-2.0.pc \
-  /usr/lib/pkgconfig/NOUSE.glib-2.0.pc</userinput></screen>
-      <para>
-        After you are done installing this package, you may move it back.
-        Doing all of this is not recommended. Please read up on
-        <xref linkend="important"/> for more information.
-      </para>
-    </important>
-
-    <note>
-      <para>
-        If you want to build Pango, HarfBuzz must be built with Glib support.
-        Instructions for doing so may be found on
-        <ulink url="&blfs-svn;/general/harfbuzz.html">BLFS's HarfBuzz page</ulink>.
-      </para>
-    </note>
-
     <para>
       Install <application>HarfBuzz</application> by running the following
       commands:
@@ -145,13 +97,12 @@ ninja</userinput></screen>
       commands:
     </para>
 
-<screen><userinput>CC="gcc -m32" CXX="g++ -m32"         \
+<screen><userinput>meson setup ..                       \
-PKG_CONFIG_PATH=/usr/lib32/pkgconfig \
+      --cross-file lib32             \
-meson setup ..                       \
       --prefix=/usr                  \
       --libdir=/usr/lib32            \
       --buildtype=release            \
-      -D graphite2=disabled
+      -D graphite2=disabled &amp;&amp;
 
 ninja</userinput></screen>
 

shareddeps/sdintro.xml

@@ -14,6 +14,19 @@
     This chapter covers dependencies that both Steam and Wine depend on.
   </para>
 
+  <!-- SECURITY -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/secdummy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/linux-pam.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/elogind.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/duktape.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/glib2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/icu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/libxml2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/shared-mime-info.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/desktop-file-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/polkit.xml"/>
+
   <!-- NETWORKING -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net/netdummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net/netconnect.xml"/>
@@ -68,16 +81,6 @@
   <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/icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/libxml2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/linux-pam.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/elogind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/duktape.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/glib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/shared-mime-info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/basicx/other/polkit.xml"/>
 
   <!-- WAYLAND -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dps/wl/wldummy.xml"/>

shareddeps/security/desktop-file-utils.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;
 
   <!ENTITY desktop-file-utils-download-http
@@ -32,8 +32,6 @@
       Specification.
     </para>
 
-    
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -98,7 +96,7 @@ ninja</userinput></screen>
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../../xincludes/meson-buildtype-release.xml"/>
+      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
   <sect2 role="configuration">

shareddeps/security/duktape.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;
 
   <!ENTITY duktape-download-http "https://duktape.org/duktape-&duktape-version;.tar.xz">

shareddeps/security/elogind-kernel.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
+  [*] <emphasis role='blue'>I</emphasis>notify support for userspace                               [INOTIFY_USER]
+  <emphasis role='blue'>P</emphasis>seudo filesystems ---&gt;
+    [*] <emphasis role='blue'>T</emphasis>mpfs virtual memory file system support (former shm fs)         [TMPFS]
+    [*]   <emphasis role='blue'>T</emphasis>mpfs POSIX Access Control Lists                     [TMPFS_POSIX_ACL]</screen>

shareddeps/security/elogind.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;
 
   <!ENTITY elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">

shareddeps/security/glib2.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;
 
   <!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
@@ -28,8 +28,6 @@
       event loop, threads, dynamic loading and an object system.
     </para>
 
-    
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -44,6 +42,18 @@
       </listitem>
     </itemizedlist>
 
+    <para>
+      <emphasis role="strong">GObject Introspection (Recommended)</emphasis>
+    </para>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download:
+          <ulink url="&gnome-download-http;/gobject-introspection/1.82/gobject-introspection-&gobject-introspection-version;.tar.xz"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <para>
       <emphasis role="strong">Patch for Log Level Selection (Optional)</emphasis>
     </para>
@@ -57,12 +67,11 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend='packaging'/>
+      <xref linkend="mesonfiles"/> (for lib32)
     </para>
--->
 
     <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
     <para role="recommended">
@@ -75,16 +84,6 @@
   <sect2 role="installation">
     <title>Installation of GLib</title>
 
-    <important>
-      <para>
-        This installation disables building GObject Introspection support.
-        After you are done with GLFS, follow the installation instructions of
-        <ulink url="&blfs-svn;/general/glib2.html">GLib</ulink> and
-        <ulink url="&blfs-svn;/postlfs/polkit.html">Polkit</ulink> in the
-        development version of BLFS to enable that support.
-      </para>
-    </important>
-
     <para>
       If desired, apply the optional patch. In many cases, applications that
       use this library, either  directly or indirectly via other libraries.
@@ -138,27 +137,92 @@ meson setup ..                  \
       -D glib_debug=disabled    \
       -D man-pages=disabled     \
       -D sysprof=disabled       &amp;&amp;
+
 ninja</userinput></screen>
 
     <para>
       As the <systemitem class="username">root</systemitem> user,
-      install this package:
+      install this package for the first time to allow building GObject
+      Introspection:
     </para>
 
     <screen role="root"><userinput>ninja install</userinput></screen>
 
     <para>
-      You should now install <xref linkend="desktop-file-utils"/> and
+      Build GObject Introspection:
-      <xref linkend="shared-mime-info"/>.
     </para>
 
+<screen><userinput>tar xf ../../gobject-introspection-1.82.0.tar.xz &amp;&amp;
+
+meson setup gobject-introspection-1.82.0 gi-build \
+            --prefix=/usr --buildtype=release     &amp;&amp;
+ninja -C gi-build</userinput></screen>
+
+    <para>
+      As the &root; user, install GObject Introspection for generating the
+      introspection data of GLib libraries (required by various packages using
+      Glib, especially some GNOME packages):
+    </para>
+
+<screen role="root"><userinput>ninja -C gi-build install</userinput></screen>
+
+    <para>
+      Now generate the introspection data:
+    </para>
+
+<screen><userinput>meson configure -D introspection=enabled &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      As the &root; user, install this package again for the introspection
+      data:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+  </sect2>
+
+  <sect2>
+    <title>32-bit Installation of GLib</title>
+
+    <para>
+      First clean the build directory:
+    </para>
+
+    <screen><userinput>rm -rf *</userinput></screen>
+
+    <para>
+      Now install GLib by running the following commands:
+    </para>
+
+<screen><userinput>meson setup ..                  \
+      --cross-file lib32        \
+      --prefix=/usr             \
+      --libdir=/usr/lib32       \
+      --buildtype=release       \
+      -D introspection=disabled \
+      -D glib_debug=disabled    \
+      -D man-pages=disabled     \
+      -D sysprof=disabled       &amp;&amp;
+
+ninja</userinput></screen>
+
+    <para>
+      Now, as the &root; user:
+    </para>
+
+<screen role="root"><userinput>DESTDIR=$PWD/DESTDIR ninja install    &amp;&amp;
+cp -vR DESTDIR/usr/lib32/* /usr/lib32 &amp;&amp;
+rm -rf DESTDIR                        &amp;&amp;
+ldconfig</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../../xincludes/meson-buildtype-release.xml"/>
+      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
       <parameter>-D man-pages=disabled</parameter>: This switch causes the

shareddeps/security/icu.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;
 
   <!ENTITY icu-download-http

shareddeps/security/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 -->
@@ -26,9 +26,7 @@
     <para>
       The <application>libxml2</application> package contains libraries
       and utilities used for parsing XML files.
-    </para>
+    </para>   
-
-    
 
     <itemizedlist spacing="compact">
       <listitem>
@@ -128,7 +126,7 @@ ldconfig</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

shareddeps/security/linux-pam.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;
 
   <!ENTITY linux-pam-download-http "https://github.com/linux-pam/linux-pam/releases/download/v&linux-pam-version;/Linux-PAM-&linux-pam-version;.tar.xz">

shareddeps/security/polkit.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;
 
   <!ENTITY polkit-download-http "https://github.com/polkit-org/polkit/archive/&polkit-version;/polkit-&polkit-version;.tar.gz">
@@ -127,7 +127,6 @@ meson setup ..                    \
       --buildtype=release         \
       -D man=false                \
       -D session_tracking=elogind \
-      -D introspection=false      \
       -D tests=false</userinput></screen>
 
     <para>
@@ -148,7 +147,7 @@ meson setup ..                    \
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../../xincludes/meson-buildtype-release.xml"/>
+      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
       <option>-D os_type=lfs</option>: Use this switch if you did not create
@@ -166,7 +165,7 @@ meson setup ..                    \
 
     <para>
       <option>-D introspection=false</option>: This option disables GObject
-      Introspection support as it was not enabled in <xref linkend='glib2'/>.
+      Introspection support if you are sure you don't need it.
     </para>
 
     <para>

shareddeps/security/secdummy.xml

@@ -0,0 +1,11 @@
+<?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">
+
+<sect1 role="dummy">
+
+
+  <title>Security</title>
+  <para/>
+</sect1>
+

shareddeps/security/shadow.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;
 
   <!ENTITY shadow-download-http "https://github.com/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">

shareddeps/security/shared-mime-info.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;
 
   <!ENTITY shared-mime-info-download-http
@@ -30,8 +30,6 @@ xreflabel="shared-mime-info-&shared-mime-info-version;">
       supporting applications.
     </para>
 
-    
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -111,7 +109,7 @@ ninja</userinput></screen>
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../../xincludes/meson-buildtype-release.xml"/>
+      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
       <parameter>-D update-mimedb=true</parameter>: This parameter tells