[blfs] branch trunk updated: Qt6: Fix patch command.

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository blfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new 6eb6acc7fb Qt6: Fix patch command.
6eb6acc7fb is described below

commit 6eb6acc7fb786973468d9d15bb35aab8bdc42262
Author: Zeckmathederg <[email protected]>
AuthorDate: Sun May 24 19:12:10 2026 -0600

    Qt6: Fix patch command.
    
    When `-d dir` is given to `patch`, it will cd into `dir`, then apply the
    patch given to it, relative to the directory. So if the path
    `../qt-everywhere-src-6.11.1-openssl4_fix-1.patch` is given, patch would
    try to find the patch at
    `qt-everywhere-src-6.11.1/qt-everywhere-src-6.11.1-openssl4_fix-1.patch`,
    or `qtbase/../qt-everywhere-src-6.11.1-openssl4_fix-1.patch`.
    
    As a result, we have to prefix an additional `../` to the path, so it
    would resolve as
    `qtbase/../../qt-everywhere-src-6.11.1-openssl4_fix-1.patch`, or
    `qt-everywhere-src-6.11.1/../qt-everywhere-src-6.11.1-openssl4_fix-1.patch`.
    
    The result is basically the same as if we did:
    ```
    pushd qtbase
    patch -Np1 -i ../../qt-everywhere-src-6.11.1-openssl4_fix-1.patch
    popd
    ```
    
    This is more clear as to what's happening and where everything is, but
    the current instructions only have one command.
---
 x/lib/qt6.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/x/lib/qt6.xml b/x/lib/qt6.xml
index 3cd6dd4de0..ae2c0c4a06 100644
--- a/x/lib/qt6.xml
+++ b/x/lib/qt6.xml
@@ -251,7 +251,15 @@ ln -sfnv qt-&qt6-version; /opt/qt6</userinput></screen>
       First, apply a patch to make the package compatible with openssl4:
     </para>
 
-<screen><userinput>patch -Np1 -i ../qt-everywhere-src-&qt6-version;-openssl4_fix-1.patch -d qtbase/</userinput></screen>
+<screen><userinput>patch -Np1 -i ../../qt-everywhere-src-&qt6-version;-openssl4_fix-1.patch -d qtbase/</userinput></screen>
+
+    <note><para>
+      The above command is correct, as <command>patch</command> will navigate
+      to the <filename class="directory">qtbase</filename> directory first,
+      before applying the patch. This means that the path to the patch must be
+      relative to that directory, instead of the current directory the command
+      is being ran from.
+    </para></note>
 
     <para>
       Next, if you are on an i686 system, disable a conflicting declaration

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page