Re: kf6-frameworks and plasma6
| Newsgroups | gmane.linux.lfs.automated |
|---|---|
| Message-ID | <CAB=uRVyjQo+6t7-gs+iLQNu8x-w_cO1hdheyrSnj7H4AunrkEA@mail.gmail.com> |
also need to accommodate kfx-intro and default y for menu selection patch attached. On Thu, Oct 24, 2024 at 12:21 PM jeremy wiig <[email protected]> wrote: > > Currently jhalfs does not populate the menu for kf6 frameworks and > plasma. This fix worked for me: > > diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh > index b64b7a2..0b2d01b 100755 > --- a/BLFS/gen-special.sh > +++ b/BLFS/gen-special.sh > @@ -108,8 +108,8 @@ cat >tmpfile << EOF > <xsl:choose> > 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/kf*/kf*-frameworks.xml \ > + ${BLFS_DIR}/kde/plasma*/plasma-all.xml; do > id=$(grep xreflabel $file | sed 's@.*id="\([^"]*\).*@\1@') > cat >>$SPECIAL_FILE << EOF > <xsl:when test="@id='$id'"> -- http://lists.linuxfromscratch.org/sympa/info/alfs-discuss Unsubscribe: See the above information page
jhalfs-kf6.patch
(application/octet-stream, 2.9 KB)
diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
index b64b7a2..b44d8f2 100755
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@@ -37,7 +37,7 @@ EXCEPTIONS=$(grep 'ENTITY.*version[ ]*"[^0-9"&.].*[0-9]' ${BLFS_DIR}/packages.en
# Non-versioned packages:
NV_LIST="postlfs-config-profile postlfs-config-random postlfs-config-vimrc \
-initramfs xorg-env kde-pre-install-config kf5-intro \
+initramfs xorg-env kde-pre-install-config kf5-intro kf6-intor \
lxqt-pre-install lxqt-post-install ojdk-conf tex-path"
cat >$SPECIAL_FILE << EOF
@@ -59,7 +59,7 @@ EOF
# Non-versionned packages. Add to NV_LIST if you need more.
for nv_id in $NV_LIST; do
-# Actually, kf5-intro contains some version info, so should be
+# Actually, kf5(6)-intro contains some version info, so should be
# versioned. For other packages, we define version to 1.0.0
# because the DTD needs a version tag.
DUM_VER=1.0.0
@@ -67,6 +67,10 @@ for nv_id in $NV_LIST; do
DUM_VER=$(grep kf5-version $BLFS_DIR/packages.ent | \
sed 's/[^"]*"\([^"]*\).*/\1/')
fi
+ if [ $nv_id = kf6-intro ]; then
+ DUM_VER=$(grep kf6-version $BLFS_DIR/packages.ent | \
+ sed 's/[^"]*"\([^"]*\).*/\1/')
+ fi
cat >>$SPECIAL_FILE << EOF
<xsl:when test="@id='$nv_id'">
<xsl:text> </xsl:text>
@@ -96,9 +100,9 @@ EOF
done
# Taking packages contained in pages installing several packages (x7* except
-# x7driver, kf5-frameworks, and plasma5-all), as versionned modules.
+# x7driver, kf5(6)-frameworks, and plasma(5)-all), as versionned modules.
# We also write a dependency expansion when a dep is of the form
-# xorg7-something or kf5-frameworks or plasma5-build. Since that is another
+# xorg7-something or kf5(6)-frameworks or plasma(5)-build. Since that is another
# template, we need a temporary file, which we shall concatenate at the end
cat >tmpfile << EOF
<xsl:template name="expand-deps">
@@ -108,8 +112,8 @@ cat >tmpfile << EOF
<xsl:choose>
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/kf*/kf*-frameworks.xml \
+ ${BLFS_DIR}/kde/plasma*/plasma-all.xml; do
id=$(grep xreflabel $file | sed 's@.*id="\([^"]*\).*@\1@')
cat >>$SPECIAL_FILE << EOF
<xsl:when test="@id='$id'">
diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl
index d3326f8..2fd3f1d 100644
--- a/BLFS/xsl/gen_config.xsl
+++ b/BLFS/xsl/gen_config.xsl
@@ -312,7 +312,8 @@ if	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,'kf6')">
<xsl:text>y
</xsl:text>