From 7d32ac4f4f0d7621c2bd9ae5a42aba793271b3d8 Mon Sep 17 00:00:00 2001
From: Zeckmathederg <zeckma.tech@gmail.com>
Date: Fri, 25 Oct 2024 19:13:55 -0600
Subject: [PATCH] NSS: Fixed a build issue if SQLite is not completely
 installed. PR (#30)

Co-authored-by: Tox <toxikuu@users.noreply.github.com>
---
 introduction/welcome/changelog.xml |  8 +++++++-
 shareddeps/net/nss.xml             | 25 +++++++++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ea728034b9..af7b891375 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,7 +43,13 @@
       <para>October 25th, 2024</para>
       <itemizedlist>
         <listitem>
-          <para>[Zeckmathederg] - rust-bindgen: 0.70.1 -&gt; 0.69.4.<para>
+          <para>[Toxikuu] - NSS: Fixed a build issue if SQLite
+          is not completely installed. PR 
+          <ulink url="https://github.com/Zeckmathederg/glfs/pull/30">(#30)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>[Zeckmathederg] - rust-bindgen: 0.70.1 -&gt; 0.69.4.</para>
         </listitem>
         <listitem>
           <para>[Toxikuu] - GLib2: Disabled tests and added libxslt as an
diff --git a/shareddeps/net/nss.xml b/shareddeps/net/nss.xml
index c0d855e120..a58bc776f5 100644
--- a/shareddeps/net/nss.xml
+++ b/shareddeps/net/nss.xml
@@ -103,16 +103,12 @@ patch -Np1 -i ../nss-&nss-version;-illegal_instruction-1.patch</userinput></scre
     <important>
       <para>
         If you're rebuilding NSS and you have not installed SQLite, run the
-        following command to prevent a build failure:
+        following command to remove a problematic library:
       </para>
 
-<screen role="root"><userinput remap="pre">sqlite3 --version > /dev/null 2>&amp;1 &amp;&amp; echo -e "\nDetected an SQLite install. You may continue." || 
-if [ -f /usr/lib/libsqlite3.so -o -f /usr/lib32/libsqlite3.so ]; then
-  echo -e "\nDetected an incomplete SQLite installation!" >&amp;2
-  rm -vf /usr/lib{,32}/libsqlite3.so
-  echo "Removed any problematic SQLite libraries. You may continue."
-else
-  echo -e "\nNo SQLite install (complete or otherwise) detected. You may continue."
+<screen role="root"><userinput remap="pre">sqlite3 --version > /dev/null 2>&amp;1 || 
+if [ -f /usr/lib/libsqlite3.so ]; then
+  rm -vf /usr/lib/libsqlite3.so
 fi</userinput></screen>
 
     </important>
@@ -230,6 +226,19 @@ install -v -m644 Linux*/lib/pkgconfig/nss.pc  /usr/lib/pkgconfig</userinput></sc
       <filename>nss</filename>.
     </para></note>
 
+    <important>
+      <para>
+        If you're rebuilding NSS and you have not installed SQLite, run the
+        following command to remove a problematic library:
+      </para>
+
+<screen role="root"><userinput remap="pre">sqlite3 --version > /dev/null 2>&amp;1 || 
+if [ -f /usr/lib32/libsqlite3.so ]; then
+  rm -vf /usr/lib32/libsqlite3.so
+fi</userinput></screen>
+
+    </important>
+
     <para>
 	Install <application>lib32-NSS</application> by running the following commands:
     </para>