[jhalfs] branch trunk updated: fix building xcb-utilities Fixes ticket #1741

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 83cfe91  fix building xcb-utilities Fixes ticket #1741
83cfe91 is described below

commit 83cfe919eaaadada41edabb60240d37aa7e3ff2f
Author: Zhang Wen <[email protected]>
AuthorDate: Wed Dec 4 15:01:02 2024 +0800

    fix building xcb-utilities
    Fixes ticket #1741
---
 BLFS/gen-special.sh       | 5 +++--
 BLFS/xsl/gen_config.xsl   | 3 ++-
 BLFS/xsl/gen_pkg_list.xsl | 3 ++-
 BLFS/xsl/make_book.xsl    | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
index b64b7a2..82f81ea 100755
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@@ -109,7 +109,8 @@ cat >tmpfile << EOF
 EOF
 for file in $(ls ${BLFS_DIR}/x/installing/x7* | grep -v x7driver) \
 	    ${BLFS_DIR}/kde/kf5/kf5-frameworks.xml                \
-	    ${BLFS_DIR}/kde/plasma5/plasma-all.xml; do
+            ${BLFS_DIR}/kde/plasma5/plasma-all.xml                \
+            ${BLFS_DIR}/x/installing/xcb-utilities.xml; do
   id=$(grep xreflabel $file | sed 's@.*id="\([^"]*\).*@\1@')
   cat >>$SPECIAL_FILE << EOF
     <xsl:when test="@id='$id'">
@@ -137,7 +138,7 @@ EOF
 
   precpack=NONE
   for pack in $list_cat; do
-    if grep -q x7 $file; then # this is an xorg package
+    if grep -q -E 'x7|xcb' $file; then # this is an xorg package
       packname=$pack
 # We extract the version from the ENTITY parts of the .xml file.
       packversion=$(grep "ENTITY ${pack}-version" $file | \
diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl
index d3326f8..00082bd 100644
--- a/BLFS/xsl/gen_config.xsl
+++ b/BLFS/xsl/gen_config.xsl
@@ -312,7 +312,8 @@ if&#9;MENU_</xsl:text>
       <!-- for compound packages, default to selecting all the subpackages-->
         <xsl:when test="contains(../name,'xorg') or
                         contains(../name,'plasma') or
-                        contains(../name,'kf5')">
+                        contains(../name,'kf5') or
+                        contains(../name,'xcb-utilities')">
           <xsl:text>y
 
 </xsl:text>
diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl
index b7426d1..3fdee71 100644
--- a/BLFS/xsl/gen_pkg_list.xsl
+++ b/BLFS/xsl/gen_pkg_list.xsl
@@ -361,7 +361,8 @@
 <!-- Call list expansion when we have a compound package -->
         <xsl:when test="contains(@linkend,'xorg7-') or
                         @linkend='kf5-frameworks' or
-                        @linkend='plasma5-build'">
+                        @linkend='plasma5-build' or
+                        @linkend='xcb-utilities'">
           <xsl:call-template name="expand-deps">
             <xsl:with-param name="section">
               <xsl:value-of select="@linkend"/>
diff --git a/BLFS/xsl/make_book.xsl b/BLFS/xsl/make_book.xsl
index 556ef37..75c6a42 100644
--- a/BLFS/xsl/make_book.xsl
+++ b/BLFS/xsl/make_book.xsl
@@ -127,7 +127,8 @@
               <xsl:apply-templates
                 select="//sect1[(contains(@id,'xorg7') or
                                  contains(@id,'frameworks') or
-                                 contains(@id,'plasma5'))
+                                 contains(@id,'plasma5') or
+                                 contains(@id,'xcb-utilities'))
                                  and .//userinput/literal[contains(string(),
                                             concat($list,'-'))]]"
                  mode="compound">

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

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