Re: [blfs-dev] xcb-utilities is not built with jhalfs

在 2024/12/4 14:49, Xi Ruoyao ([email protected] via alfs-discuss 
Mailing List) 写道:
> This hunk fails to apply.  Please ensure the patch can be applied with
> git am on top of current trunk.
the patch can be applied on top of current trunk now.
> Wouldn't this match things like libxcb, xcb-proto, and etc. incorrectly?
The file variable is from the limited values in the following for line, 
so this won't match things like libxcb, xcb-proto, and etc.

for file in $(ls ${BLFS_DIR}/x/installing/x7* | grep -v x7driver) \
             ${BLFS_DIR}/kde/kf6/kf6-frameworks.xml                \
             ${BLFS_DIR}/kde/plasma/plasma-all.xml                 \
             ${BLFS_DIR}/x/installing/xcb-utilities.xml; do

> And why use "-e" and "\|"?  In extended regexp "|" itself (w/o "\") is a
> meta-character.
> Don't change indent from space to tab for no reason.
fixed in this version.

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/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">

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

From f7c66c19b011a9a5d09356892e8aab24e728ec75 Mon Sep 17 00:00:00 2001
From: Zhang Wen <[email protected]>
Date: Wed, 4 Dec 2024 15:01:02 +0800
Subject: [PATCH] fix building xcb-utilities

---
 BLFS/gen-special.sh     | 5 +++--
 BLFS/xsl/gen_config.xsl | 3 ++-
 BLFS/xsl/make_book.xsl  | 3 ++-
 3 files changed, 7 insertions(+), 4 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/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">
-- 
2.47.1