[jhalfs] branch trunk updated: Adapt to libxkbfile case in Xorg libraries

This is a multi-part message in MIME format...

------------=_1770036982-1253-3100
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

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

git pushed a commit to branch trunk
in repository jhalfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new cc8df81  Adapt to libxkbfile case in Xorg libraries
cc8df81 is described below

commit cc8df81641ef779d5004077a433790fdc4e2dfa7
Author: Pierre Labastie <[email protected]>
AuthorDate: Mon Feb 2 13:44:46 2026 +0100

    Adapt to libxkbfile case in Xorg libraries
    
    libxkbfile went to meson, so it is the same case as libpciaccess.
    But the extracted instructions were wrong because of the change
    in the case statement. Extract the correct instructions.
---
 BLFS/xsl/make_book.xsl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/BLFS/xsl/make_book.xsl b/BLFS/xsl/make_book.xsl
index 9297efd..b29a678 100644
--- a/BLFS/xsl/make_book.xsl
+++ b/BLFS/xsl/make_book.xsl
@@ -548,7 +548,7 @@
       <!-- We extract install instructions from the userinput containing
            a loop. There is always one pushd and one popd command.
            Problem is there may be more than one popd (case of kapidox
-           in kf6 and libpciaccess in Xorg libraries). So we call
+           in kf6 and libpciaccess,libxkbfile in Xorg libraries). So we call
            a special template for providing instructions that work in
            all cases. -->
       <xsl:variable name="install-instructions">
@@ -722,8 +722,8 @@ name=$(echo $packagedir | sed 's/-[[:digit:]].*//')
   </xsl:template>
 
   <xsl:template name="inst-instr">
-    <!-- This template is necessary because of the "libpciaccess" case in Xorg
-         libraries and the "kapidox" case in kf6:
+    <!-- This template is necessary because of the "libpciaccess" and
+         "libxkbfile" cases in Xorg and the "kapidox" case in kf6:
          Normally, the general instructions extract the package and change
          to the extracted dir for running the installation instructions.
          When installing a sub-package of a compound package, the installation
@@ -742,9 +742,15 @@ name=$(echo $packagedir | sed 's/-[[:digit:]].*//')
             <!-- only the instructions inside the "case" and before popd -->
             <xsl:copy-of select="substring-after(substring-before($inst-instr,'popd'),'kapidox)')"/>
           </xsl:when>
-          <xsl:when test="$package='libpciaccess'">
+          <xsl:when test="$package='libpciaccess' or
+                          $package='libxkbfile'">
             <!-- only the instructions inside the "case" and before popd -->
-            <xsl:copy-of select="substring-after(substring-before($inst-instr,'popd'),'libpciaccess* )')"/>
+            <xsl:copy-of
+            select="substring-after(
+                      substring-after(
+                        substring-before($inst-instr,'popd'),
+                        'libpciaccess'),
+                      ')')"/>
           </xsl:when>
           <xsl:otherwise>
             <!-- We first copy what is before the first "as_root", then what is

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

------------=_1770036982-1253-3100
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page
------------=_1770036982-1253-3100--