Changeset f806bbf2

Timestamp:

03/06/2024 06:34:58 AM (8 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

ken/TL2024, trunk, xry111/llvm18

Children:

5e614d47

Parents:

81575be

Message:

Update most of kde-gear

There are still a few packages that need testing and the book updated.
The kf6 adn plasma packages referenced in LXQt are incorrect and need
to be changed to reference kf5 packages for now.

Note that there is a new package, plasma-activities, that is needed in
the kde-gear section, but needed to be taken from the plasma6 set of
packages.

kio-extras is no longer needed for the packages in the book.

Files:

• general/graphlib/poppler.xml (modified) (1 diff)
• kde/kf5-apps/add-pkgs.xml (modified) (3 diffs)
• kde/kf5-apps/ark5.xml (modified) (8 diffs)
• kde/kf5-apps/gwenview.xml (modified) (10 diffs)
• kde/kf5-apps/k3b.xml (modified) (5 diffs)
• kde/kf5-apps/kdenlive5.xml (modified) (10 diffs)
• kde/kf5-apps/kf5-apps.xml (modified) (1 diff)
• kde/kf5-apps/khelpcenter.xml (modified) (5 diffs)
• kde/kf5-apps/kmix5.xml (modified) (11 diffs)
• kde/kf5-apps/konsole5.xml (modified) (9 diffs)
• kde/kf5-apps/libkcddb.xml (modified) (5 diffs)
• kde/kf5-apps/libkdcraw.xml (modified) (5 diffs)
• kde/kf5-apps/libkexiv2.xml (modified) (5 diffs)
• kde/kf5-apps/okular5.xml (modified) (10 diffs)
• kde/kf5-apps/plasma-activities.xml (added)
• packages.ent (modified) (2 diffs)
• postlfs/editors/kate.xml (modified) (10 diffs)
• x/lib/lib.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (15 diffs)

general/graphlib/poppler.xml

@@ -137 +137 @@
       <xref linkend="openjpeg2"/>, and
       &qt5-deps;
-      (required for PDF support in <xref role="nodep" linkend="okular5"/>)
+      (required for PDF support in <xref role="nodep" linkend="okular"/>)
     </para>
 

kde/kf5-apps/add-pkgs.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="kde-add-pkgs" xreflabel="Further KDE5 packages">
+<sect1 id="kde-add-pkgs" xreflabel="Further KDE packages">
   <?dbhtml filename="add-pkgs.html"?>
 
 
-  <title>Further KDE5 packages</title>
+  <title>Further KDE packages</title>
 
   <para>
     This section did not provide instructions for all of the available packages
-    in the KDE5 Software Compilation. The included packages were selected
+    in the KDE Software Compilation (KDE Gear). The included packages were selected
     based on what most people would want to use on a standard desktop computer.
   </para>
@@ -41 +41 @@
       <para>Kcalc: A scientific calculator.</para>
     </listitem>
-<!--<listitem> An old kde4 app, https://invent.kde.org/unmaintained/kaccessible
-      <para>Kaccessible: Integration of accessibility utilities.</para>
-    </listitem> -->
-<!--<listitem> moved to kf5-apps in 6b25d09d4ebb4 for khelpcenter
-      <para>Kio-extras: various plugins for urls like <command>man://</command>
-      or <command>smb://</command>.</para>
-    </listitem>-->
     <listitem>
       <para>Kwalletmanager: A credentials management application.</para>
@@ -79 +72 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \

kde/kf5-apps/ark5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY ark5-download-http "&kf5apps-download-http;/ark-&kf5apps-version;.tar.xz">
-  <!ENTITY ark5-download-ftp  " ">
-  <!ENTITY ark5-md5sum        "f249f98d0e7a0b87f6c3dc3fc48618d4">
-  <!ENTITY ark5-size          "2.9 MB">
-  <!ENTITY ark5-buildsize     "34 MB">
-  <!ENTITY ark5-time          "0.3 SBU (using parallelism=4)">
+  <!ENTITY ark-download-http "&kf5apps-download-http;/ark-&kf5apps-version;.tar.xz">
+  <!ENTITY ark-download-ftp  " ">
+  <!ENTITY ark-md5sum        "f249f98d0e7a0b87f6c3dc3fc48618d4">
+  <!ENTITY ark-size          "2.9 MB">
+  <!ENTITY ark-buildsize     "34 MB">
+  <!ENTITY ark-time          "0.3 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="ark5" xreflabel="Ark-&kf5apps-version;">
-  <?dbhtml filename="ark5.html"?>
+<sect1 id="ark" xreflabel="Ark-&kf5apps-version;">
+  <?dbhtml filename="ark.html"?>
 
 
   <title>Ark-&kf5apps-version;</title>
 
-  <indexterm zone="ark5">
+  <indexterm zone="ark">
     <primary sortas="a-Ark">Ark</primary>
   </indexterm>
@@ -27 +27 @@
 
     <para>
-      The <application>Ark</application> package is a KF5 archive tool.
+      The <application>Ark</application> package is a KF6 archive tool.
       It is a graphical front end to tar and similar tools.
     </para>
@@ -37 +37 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&ark5-download-http;"/>
+          Download (HTTP): <ulink url="&ark-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&ark5-download-ftp;"/>
+          Download (FTP): <ulink url="&ark-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &ark5-md5sum;
+          Download MD5 sum: &ark-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &ark5-size;
+          Download size: &ark-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &ark5-buildsize;
+          Estimated disk space required: &ark-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &ark5-time;
+          Estimated build time: &ark-time;
         </para>
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ark-&kf5apps-version;-upstream_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Ark Dependencies</bridgehead>
@@ -85 +74 @@
       <xref linkend="libarchive"/>
     </para>
-
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -101 +89 @@
   <sect2 role="installation">
     <title>Installation of Ark</title>
-<!--
-    <para>First, fix a problem identified upstream:</para>
 
-<screen><userinput>patch -Np1 -i ../ark-&kf5apps-version;-upstream_fix-1.patch</userinput></screen>
--->
     <para>
       Install <application>Ark</application> by running the following
@@ -114 +98 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -148 +132 @@
         </seg>
         <seg>
-          $KF5_PREFIX/lib/plugins/kerfuffle,
-          $KF5_PREFIX/share/doc/HTML/*/ark, and
-          $KF5_PREFIX/share/kxmlgui5/ark
+          $KF6_PREFIX/lib/plugins/kerfuffle and
+          $KF6_PREFIX/share/doc/HTML/*/ark
         </seg>
       </seglistitem>
@@ -160 +143 @@
       <?dbhtml list-presentation="table"?>
 
-     <varlistentry id="ark5-prog">
+     <varlistentry id="ark-prog">
         <term><command>ark</command></term>
         <listitem>
           <para>
-             is a KF5-based Archive Manager
+             is a KF6-based Archive Manager
           </para>
-          <indexterm zone="ark5 ark5-prog">
+          <indexterm zone="ark ark-prog">
             <primary sortas="b-ark">ark</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-
-<!--
-     <varlistentry id="arkprofile5">
-        <term><command>arkprofile</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to change the current tab's profile
-            options.
-          </para>
-          <indexterm zone="ark5 arkprofile5">
-            <primary sortas="b-arkprofile">arkprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
 
     </variablelist>

kde/kf5-apps/gwenview.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY gwenview5-download-http "&kf5apps-download-http;/gwenview-&kf5apps-version;.tar.xz">
-  <!ENTITY gwenview5-download-ftp  " ">
-  <!ENTITY gwenview5-md5sum        "dded6bc13018cb19276257158a428be0">
-  <!ENTITY gwenview5-size          "6.6 MB">
-  <!ENTITY gwenview5-buildsize     "50 MB">
-  <!ENTITY gwenview5-time          "0.5 SBU (using parallelism=4)">
+  <!ENTITY gwenview-download-http "&kf5apps-download-http;/gwenview-&kf5apps-version;.tar.xz">
+  <!ENTITY gwenview-download-ftp  " ">
+  <!ENTITY gwenview-md5sum        "45ff7c02b7372150f3f216b8861811a0">
+  <!ENTITY gwenview-size          "6.6 MB">
+  <!ENTITY gwenview-buildsize     "55 MB">
+  <!ENTITY gwenview-time          "0.8 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="gwenview5" xreflabel="Gwenview-&kf5apps-version;">
-  <?dbhtml filename="gwenview5.html"?>
+<sect1 id="gwenview" xreflabel="Gwenview-&kf5apps-version;">
+  <?dbhtml filename="gwenview.html"?>
 
 
   <title>Gwenview-&kf5apps-version;</title>
 
-  <indexterm zone="gwenview5">
+  <indexterm zone="gwenview">
     <primary sortas="a-Gwenview">Gwenview</primary>
   </indexterm>
@@ -37 +37 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&gwenview5-download-http;"/>
+          Download (HTTP): <ulink url="&gwenview-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&gwenview5-download-ftp;"/>
+          Download (FTP): <ulink url="&gwenview-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &gwenview5-md5sum;
+          Download MD5 sum: &gwenview-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &gwenview5-size;
+          Download size: &gwenview-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &gwenview5-buildsize;
+          Estimated disk space required: &gwenview-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &gwenview5-time;
+          Estimated build time: &gwenview-time;
         </para>
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch for building against <xref linkend="kimageannotator"/>:
-          <ulink url="&patch-root;/gwenview-&kf5apps-version;-build_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Gwenview Dependencies</bridgehead>
 
@@ -94 +84 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="https://download.kde.org/stable/release-service/&kf5apps-version;/src/">KF5Kipi</ulink>
+      <xref linkend="plasma-activities"/> and 
+      <ulink url="https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html">CFitsio</ulink> 
     </para>
 
@@ -102 +93 @@
     <title>Installation of Gwenview</title>
 
-    <!-- Ticket #19206 and #19329 -->
-<!-- Fixed for version 24.02.0
-    <para>
-      First, work around an incompatibility with recent changes in kImageAnnotator:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gwenview-&kf5apps-version;-build_fixes-1.patch</userinput></screen>
--->
     <para>
       Install <application>Gwenview</application> by running the following
@@ -118 +101 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -153 +136 @@
         </seg>
         <seg>
-          $KF5_PREFIX/share/{kxmlgui5/gvpart,gwenview,doc/HTML/*/gwenview}
+          $KF6_PREFIX/share/{gwenview,doc/HTML/*/gwenview}
         </seg>
       </seglistitem>
@@ -163 +146 @@
       <?dbhtml list-presentation="table"?>
 
-     <varlistentry id="gwenview5-prog">
+     <varlistentry id="gwenview-prog">
         <term><command>gwenview</command></term>
         <listitem>
@@ -169 +152 @@
             is the KDE image viewer
           </para>
-          <indexterm zone="gwenview5 gwenview5-prog">
+          <indexterm zone="gwenview gwenview-prog">
             <primary sortas="b-gwenview">gwenview</primary>
           </indexterm>
@@ -175 +158 @@
       </varlistentry>
 
-     <varlistentry id="gwenview5-importer">
+     <varlistentry id="gwenview-importer">
         <term><command>gwenview_importer</command></term>
         <listitem>
@@ -181 +164 @@
             is a Photo importer
           </para>
-          <indexterm zone="gwenview5 gwenview5-importer">
+          <indexterm zone="gwenview gwenview-importer">
             <primary sortas="b-gwenview_importer">gwenview_importer</primary>
           </indexterm>

kde/kf5-apps/k3b.xml

@@ -7 +7 @@
   <!ENTITY k3b-download-http "&kf5apps-download-http;/k3b-&kf5apps-version;.tar.xz">
   <!ENTITY k3b-download-ftp  " ">
-  <!ENTITY k3b-md5sum        "3f439733aacc1cd4028faf3a7accf035">
+  <!ENTITY k3b-md5sum        "63d0cc37185c49f759f60c0f265572bc">
   <!ENTITY k3b-size          "10 MB">
   <!ENTITY k3b-buildsize     "128 MB">
@@ -27 +27 @@
 
     <para>
-      The <application>K3b</application> package contains a KF5-based
+      The <application>K3b</application> package contains a KF6-based
       graphical interface to the <application>Cdrtools</application> and
       <application>dvd+rw-tools</application> CD/DVD manipulation tools. It also
@@ -149 +149 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -160 +160 @@
 
     <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
+      Now, as the &root; user:
     </para>
 
@@ -185 +185 @@
         </seg>
         <seg>
-          $KF5_PREFIX/share/{,kxmlgui5/}k3b and
-          $KF5_PREFIX/share/doc/HTML/*/k3b
+          $KF6_PREFIX/share/k3b and
+          $KF6_PREFIX/share/doc/HTML/*/k3b
         </seg>
       </seglistitem>

kde/kf5-apps/kdenlive5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kdenlive5-download-http "&kf5apps-download-http;/kdenlive-&kf5apps-version;.tar.xz">
-  <!ENTITY kdenlive5-download-ftp  " ">
-  <!ENTITY kdenlive5-md5sum        "c5e610a27fc99f0a761739aafc897238">
-  <!ENTITY kdenlive5-size          "12 MB">
-  <!ENTITY kdenlive5-buildsize     "201 MB">
-  <!ENTITY kdenlive5-time          "1.4 SBU (using parallelism=4)">
+  <!ENTITY kdenlive-download-http "&kf5apps-download-http;/kdenlive-&kf5apps-version;.tar.xz">
+  <!ENTITY kdenlive-download-ftp  " ">
+  <!ENTITY kdenlive-md5sum        "9c0f3a0332e38e0cc1ff370cc635043b">
+  <!ENTITY kdenlive-size          "13 MB">
+  <!ENTITY kdenlive-buildsize     "216 MB">
+  <!ENTITY kdenlive-time          "2.0 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="kdenlive5" xreflabel="Kdenlive-&kf5apps-version;">
+<sect1 id="kdenlive" xreflabel="Kdenlive-&kf5apps-version;">
   <?dbhtml filename="kdenlive.html"?>
 
@@ -19 +19 @@
   <title>Kdenlive-&kf5apps-version;</title>
 
-  <indexterm zone="kdenlive5">
+  <indexterm zone="kdenlive">
     <primary sortas="a-Kdenlive">Kdenlive</primary>
   </indexterm>
@@ -27 +27 @@
 
     <para>
-      The <application>Kdenlive</application> package is a KF5 based video
+      The <application>Kdenlive</application> package is a KF6 based video
       editor.
     </para>
@@ -37 +37 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&kdenlive5-download-http;"/>
+          Download (HTTP): <ulink url="&kdenlive-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&kdenlive5-download-ftp;"/>
+          Download (FTP): <ulink url="&kdenlive-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &kdenlive5-md5sum;
+          Download MD5 sum: &kdenlive-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &kdenlive5-size;
+          Download size: &kdenlive-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &kdenlive5-buildsize;
+          Estimated disk space required: &kdenlive-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &kdenlive5-time;
+          Estimated build time: &kdenlive-time;
         </para>
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/kdenlive-&kf5apps-version;-segfault_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Kdenlive Dependencies</bridgehead>
 
@@ -95 +85 @@
   <sect2 role="installation">
     <title>Installation of Kdenlive</title>
-<!--
-    <para>
-      First, apply a patch to fix segmentation faults upon exiting Kdenlive:
-    </para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../kdenlive-&kf5apps-version;-segfault_fix-1.patch</userinput></screen>
--->
     <para>
       Install <application>Kdenlive</application> by running the following
@@ -110 +94 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -144 +128 @@
         </seg>
         <seg>
-          $KF5_PREFIX/share/doc/HTML/*/kdenlive,
-          $KF5_PREFIX/share/kdenlive, and
-          $KF5_PREFIX/share/kxmlgui5/kdenlive
+          $KF6_PREFIX/share/doc/HTML/*/kdenlive and
+          $KF6_PREFIX/share/kdenlive
         </seg>
       </seglistitem>
@@ -156 +139 @@
       <?dbhtml list-presentation="table"?>
 
-     <varlistentry id="kdenlive">
+     <varlistentry id="kdenlive-prog">
         <term><command>kdenlive</command></term>
         <listitem>
@@ -163 +146 @@
              a large number of formats
           </para>
-          <indexterm zone="kdenlive5 kdenlive">
+          <indexterm zone="kdenlive kdenlive-prog">
             <primary sortas="b-kdenlive">kdenlive</primary>
           </indexterm>
@@ -175 +158 @@
              is a render program for <command>kdenlive</command>
           </para>
-          <indexterm zone="kdenlive5 kdenlive_render">
+          <indexterm zone="kdenlive kdenlive_render">
             <primary sortas="b-kdenlive_render">kdenlive_render</primary>
           </indexterm>

kde/kf5-apps/kf5-apps.xml

@@ -7 +7 @@
 
 <chapter id="kf5-apps">
-  <?dbhtml filename="kf5-apps.html"?>
+  <?dbhtml filename="kf6-apps.html"?>
 
-  <title>KDE Frameworks 5 Based Applications</title>
+  <title>KDE Frameworks 6 Based Applications</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ark5.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate5.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenlive5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmix5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kio-extras.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kio-extras.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="khelpcenter.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konsole5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma-activities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="okular5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkdcraw.xml"/>

kde/kf5-apps/khelpcenter.xml

@@ -71 +71 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="grantlee"/>,
       <xref linkend="kf5-frameworks"/>,
       <xref linkend="libxml2"/>, and
@@ -79 +78 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="kio-extras"/>
+      <xref linkend="qtwebengine"/>
     </para>
-<!--
+
+<!-- Is this true any more ???
     <note>
       <para>
@@ -105 +105 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -119 +119 @@
     </para>
 
-<screen role="root"><userinput>make install  &amp;&amp;
-
-mv -v $KF5_PREFIX/share/kde4/services/khelpcenter.desktop /usr/share/applications/ &amp;&amp;
-rm -rv $KF5_PREFIX/share/kde4</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -139 +136 @@
         </seg>
         <seg>
-          libkdeinit5_khelpcenter.so
+          None
         </seg>
         <seg>
-          $KF5_PREFIX/share/khelpcenter,
-          $KF5_PREFIX/share/kxmlgui5/khelpcenter, and
-          $KF5_PREFIX/share/doc/HTML/*/{khelpcenter,fundamentals,onlinehelp}
+          $KF6_PREFIX/share/khelpcenter,
+          $KF6_PREFIX/share/doc/HTML/*/{khelpcenter,fundamentals,onlinehelp}
         </seg>
       </seglistitem>

kde/kf5-apps/kmix5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY kmix5-download-http "&kf5apps-download-http;/kmix-&kf5apps-version;.tar.xz">
-  <!ENTITY kmix5-download-ftp  " ">
-  <!ENTITY kmix5-md5sum        "a58f84cfc3aa7aeb1745ef0889788dc9">
-  <!ENTITY kmix5-size          "1.2 MB">
-  <!ENTITY kmix5-buildsize     "20 MB">
-  <!ENTITY kmix5-time          "0.2 SBU (using parallelism=4)">
+  <!ENTITY kmix-download-http "&kf5apps-download-http;/kmix-&kf5apps-version;.tar.xz">
+  <!ENTITY kmix-download-ftp  " ">
+  <!ENTITY kmix-md5sum        "60b622cd36e45f2ea9586b9c3beaba2d">
+  <!ENTITY kmix-size          "1.2 MB">
+  <!ENTITY kmix-buildsize     "20 MB">
+  <!ENTITY kmix-time          "0.2 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="kmix5" xreflabel="KMix-&kf5apps-version;">
-  <?dbhtml filename="kmix5.html"?>
+<sect1 id="kmix" xreflabel="KMix-&kf5apps-version;">
+  <?dbhtml filename="kmix.html"?>
 
 
   <title>KMix-&kf5apps-version;</title>
 
-  <indexterm zone="kmix5">
+  <indexterm zone="kmix">
     <primary sortas="a-KMix">KMix</primary>
   </indexterm>
@@ -27 +27 @@
 
     <para>
-      The <application>KMix</application> package contains a KF5 based Sound
+      The <application>KMix</application> package contains a KF6 based Sound
       Mixer application.
     </para>
@@ -37 +37 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&kmix5-download-http;"/>
+          Download (HTTP): <ulink url="&kmix-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&kmix5-download-ftp;"/>
+          Download (FTP): <ulink url="&kmix-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &kmix5-md5sum;
+          Download MD5 sum: &kmix-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &kmix5-size;
+          Download size: &kmix-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &kmix5-buildsize;
+          Estimated disk space required: &kmix-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &kmix5-time;
+          Estimated build time: &kmix-time;
         </para>
       </listitem>
@@ -98 +98 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -116 +116 @@
   </sect2>
 
-<!-- With 18.12.0, kmix now is kf5 only.
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DKMIX_KF5_BUILD=1</parameter>: This switch is used to ensure
-      that <application>KDE Frameworks</application> 5 based application is
-      built.
-    </para>
-
-  </sect2>
--->
-
   <sect2 role="content">
     <title>Contents</title>
@@ -145 +132 @@
         </seg>
         <seg>
-          $KF5_PREFIX/share/kmix,
-          $KF5_PREFIX/share/kxmlgui5/kmix, and
-          $KF5_PREFIX/share/doc/HTML/*/kmix
+          $KF6_PREFIX/share/kmix and
+          $KF6_PREFIX/share/doc/HTML/*/kmix
         </seg>
       </seglistitem>
@@ -157 +143 @@
       <?dbhtml list-presentation="table"?>
 
-     <varlistentry id="kmix5-prog">
+     <varlistentry id="kmix-prog">
         <term><command>kmix</command></term>
         <listitem>
@@ -163 +149 @@
             is a mini audio mixer for kde
           </para>
-          <indexterm zone="kmix5 kmix5-prog">
+          <indexterm zone="kmix kmix-prog">
             <primary sortas="b-kmix">kmix</primary>
           </indexterm>
@@ -169 +155 @@
       </varlistentry>
 
-     <varlistentry id="kmixctrl5">
+     <varlistentry id="kmixctrl">
         <term><command>kmixctrl</command></term>
         <listitem>
@@ -176 +162 @@
             <command>kmix</command>
           </para>
-          <indexterm zone="kmix5 kmixctrl5">
+          <indexterm zone="kmix kmixctrl">
             <primary sortas="b-kmixctrl">kmixctrl</primary>
           </indexterm>
@@ -188 +174 @@
             is a utility to mute, get and set volume levels
           </para>
-          <indexterm zone="kmix5 kmixremote">
+          <indexterm zone="kmix kmixremote">
             <primary sortas="b-kmixremote">kmixremote</primary>
           </indexterm>

kde/kf5-apps/konsole5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY konsole5-download-http "&kf5apps-download-http;/konsole-&kf5apps-version;.tar.xz">
-  <!ENTITY konsole5-download-ftp  " ">
-  <!ENTITY konsole5-md5sum        "7c7297f44101d0765c9d843fc99a44d6">
-  <!ENTITY konsole5-size          "1.8 MB">
-  <!ENTITY konsole5-buildsize     "54 MB">
-  <!ENTITY konsole5-time          "0.5 SBU (using parallelism=4)">
+  <!ENTITY konsole-download-http "&kf5apps-download-http;/konsole-&kf5apps-version;.tar.xz">
+  <!ENTITY konsole-download-ftp  " ">
+  <!ENTITY konsole-md5sum        "d6195f0b41d438428c2e433ff45b4c1b">
+  <!ENTITY konsole-size          "1.7 MB">
+  <!ENTITY konsole-buildsize     "60 MB">
+  <!ENTITY konsole-time          "0.7 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="konsole5" xreflabel="Konsole-&kf5apps-version;">
-  <?dbhtml filename="konsole5.html"?>
+<sect1 id="konsole" xreflabel="Konsole-&kf5apps-version;">
+  <?dbhtml filename="konsole.html"?>
 
 
   <title>Konsole-&kf5apps-version;</title>
 
-  <indexterm zone="konsole5">
+  <indexterm zone="konsole">
     <primary sortas="a-Konsole">Konsole</primary>
   </indexterm>
@@ -27 +27 @@
 
     <para>
-      The <application>Konsole</application> package is a KF5 based terminal
+      The <application>Konsole</application> package is a KF6 based terminal
       emulator.
     </para>
@@ -37 +37 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&konsole5-download-http;"/>
+          Download (HTTP): <ulink url="&konsole-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&konsole5-download-ftp;"/>
+          Download (FTP): <ulink url="&konsole-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &konsole5-md5sum;
+          Download MD5 sum: &konsole-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &konsole5-size;
+          Download size: &konsole-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &konsole5-buildsize;
+          Estimated disk space required: &konsole-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &konsole5-time;
+          Estimated build time: &konsole-time;
         </para>
       </listitem>
@@ -113 +113 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
@@ -144 +144 @@
         </seg>
         <seg>
-          libkdeinit5_konsole.so and libkonsoleprivate.so
+          libkdeinit6_konsole.so and libkonsoleprivate.so
         </seg>
         <seg>
-          $KF5_PREFIX/share/doc/HTML/*/konsole,
-          $KF5_PREFIX/share/konsole, and
-          $KF5_PREFIX/share/kxmlgui5/konsole
+          $KF6_PREFIX/share/doc/HTML/*/konsole,
+          $KF6_PREFIX/share/konsole, and
+          $KF6_PREFIX/share/kxmlgui6/konsole
         </seg>
       </seglistitem>
@@ -159 +159 @@
       <?dbhtml list-presentation="table"?>
 
-     <varlistentry id="konsole5-prog">
+     <varlistentry id="konsole-prog">
         <term><command>konsole</command></term>
         <listitem>
@@ -166 +166 @@
              interface
           </para>
-          <indexterm zone="konsole5 konsole5-prog">
+          <indexterm zone="konsole konsole-prog">
             <primary sortas="b-konsole">konsole</primary>
           </indexterm>
@@ -172 +172 @@
       </varlistentry>
 
-     <varlistentry id="konsoleprofile5">
+     <varlistentry id="konsoleprofile">
         <term><command>konsoleprofile</command></term>
         <listitem>
@@ -179 +179 @@
             options
           </para>
-          <indexterm zone="konsole5 konsoleprofile5">
+          <indexterm zone="konsole konsoleprofile">
             <primary sortas="b-konsoleprofile">konsoleprofile</primary>
           </indexterm>

kde/kf5-apps/libkcddb.xml

@@ -7 +7 @@
   <!ENTITY libkcddb-download-http "&kf5apps-download-http;/libkcddb-&kf5apps-version;.tar.xz">
   <!ENTITY libkcddb-download-ftp  " ">
-  <!ENTITY libkcddb-md5sum        "ae21a89d6c91edd4c62e1c391f6d0282">
+  <!ENTITY libkcddb-md5sum        "29438c22614fb4bd372c7cd326ce5853">
   <!ENTITY libkcddb-size          "444 KB">
-  <!ENTITY libkcddb-buildsize     "10 MB">
-  <!ENTITY libkcddb-time          "0.1 SBU (Using parallelism=4)">
+  <!ENTITY libkcddb-buildsize     "11 MB">
+  <!ENTITY libkcddb-time          "0.1 SBU">
 ]>
 
@@ -71 +71 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="kf5-frameworks"/> and
+      <xref linkend="kf5-frameworks"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="libmusicbrainz5"/>
     </para>
@@ -88 +92 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
+      -DQT_MAJOR_VERSION=6               \
       -Wno-dev ..                        &amp;&amp;
 make</userinput></screen>
@@ -118 +123 @@
         </seg>
         <seg>
-          libKF5Cddb.so and
-          kcm_cddb.so
+          libKCddb6.so
         </seg>
         <seg>
-          $KF5_PREFIX/include/KF5/KCddb and
-          $KF5_PREFIX/lib/cmake/KF5Cddb
-          $KF5_PREFIX/share/doc/HTML/*/kcontrol
+          $KF6_PREFIX/include/KCddb6
+          $KF6_PREFIX/lib/cmake/KCddb6
+          $KF6_PREFIX/share/doc/HTML/*/kcontrol
         </seg>
       </seglistitem>
@@ -135 +139 @@
 
       <varlistentry id="libkcddb-lib">
-        <term><filename class="libraryfile">libkcddb.so</filename></term>
+        <term><filename class="libraryfile">libKCddb6.so</filename></term>
         <listitem>
           <para>

kde/kf5-apps/libkdcraw.xml

@@ -7 +7 @@
   <!ENTITY libkdcraw-download-http "&kf5apps-download-http;/libkdcraw-&kf5apps-version;.tar.xz">
   <!ENTITY libkdcraw-download-ftp  " ">
-  <!ENTITY libkdcraw-md5sum        "7d46c055f3548a501a5c0d6545fe5bac">
+  <!ENTITY libkdcraw-md5sum        "33da02ba2599dfe982f27182db140bdb">
   <!ENTITY libkdcraw-size          "40 KB">
-  <!ENTITY libkdcraw-buildsize     "1.6 MB">
+  <!ENTITY libkdcraw-buildsize     "1.7 MB">
   <!ENTITY libkdcraw-time          "less than 0.1 SBU">
 ]>
@@ -66 +66 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/libkdcraw-&kf5apps-version;-libraw19-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">libkdcraw Dependencies</bridgehead>
 
@@ -90 +79 @@
   <sect2 role="installation">
     <title>Installation of libkdcraw</title>
-<!--
-    <para>
-      Fix building with libraw-0.21.0 or later:
-    </para>
 
-<screen><userinput>sed -e '/shot_select/s/params/raw&amp;/' \
-    -i src/kdcraw.cpp</userinput></screen>
--->
     <para>
       Install <application>libkdcraw</application> by running the following
@@ -106 +88 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
       -DBUILD_TESTING=OFF                \
+      -DQT_MAJOR_VERSION=6               \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
@@ -137 +120 @@
         </seg>
         <seg>
-          libKF5KDcraw.so
+          libKDcrawQt6.so
         </seg>
         <seg>
-          $KF5_PREFIX/include/KF5/KDCRAW and
-          $KF5_PREFIX/lib/cmake/KF5KDcraw
+          $KF5_PREFIX/include/KDcrawQt6 and
+          $KF5_PREFIX/lib/cmake/KDcrawQt6
         </seg>
       </seglistitem>

kde/kf5-apps/libkexiv2.xml

@@ -7 +7 @@
   <!ENTITY libkexiv2-download-http "&kf5apps-download-http;/libkexiv2-&kf5apps-version;.tar.xz">
   <!ENTITY libkexiv2-download-ftp  " ">
-  <!ENTITY libkexiv2-md5sum        "fbb745604cccbec99980cd702eb50684">
+  <!ENTITY libkexiv2-md5sum        "c2bab09ac7b6797ddac47aca038265cc">
   <!ENTITY libkexiv2-size          "60 KB">
-  <!ENTITY libkexiv2-buildsize     "3.3 MB">
+  <!ENTITY libkexiv2-buildsize     "3.5 MB">
   <!ENTITY libkexiv2-time          "0.2 SBU">
 ]>
@@ -66 +66 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch for building against exiv2-0.28 and above.
-          <ulink url="&patch-root;/libkexiv2-&kf5apps-version;-exiv_0_28-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">libkexiv2 Dependencies</bridgehead>
 
@@ -89 +79 @@
   <sect2 role="installation">
     <title>Installation of libkexiv2</title>
-<!--
-    <para>
-      First, fix building against exiv2-0.28 and above:
-    </para>
 
-<screen><userinput>patch -Np1 -i ../libkexiv2-&kf5apps-version;-exiv_0_28-1.patch</userinput></screen>
--->
     <para>
       Install <application>libkexiv2</application> by running the following
@@ -104 +88 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
       -DCMAKE_BUILD_TYPE=Release         \
+      -DBUILD_WITH_QT6=ON                \
       -DBUILD_TESTING=OFF                \
       -Wno-dev .. &amp;&amp;
@@ -135 +120 @@
         </seg>
         <seg>
-          libKF5KExiv2.so
+          libKExiv2Qt6.so
         </seg>
         <seg>
-          $KF5_PREFIX/include/KF5/KExiv2 and
-          $KF5_PREFIX/lib/cmake/KF5KExiv2
+          $KF5_PREFIX/include/KExiv2Qt6 and
+          $KF5_PREFIX/lib/cmake/KExiv2Qt6
         </seg>
       </seglistitem>

kde/kf5-apps/okular5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY okular5-download-http "&kf5apps-download-http;/okular-&kf5apps-version;.tar.xz">
-  <!ENTITY okular5-download-ftp  " ">
-  <!ENTITY okular5-md5sum        "b974ae6ac5232d8b3d033c8b4e3c37f1">
-  <!ENTITY okular5-size          "8.1 MB">
-  <!ENTITY okular5-buildsize     "86 MB">
-  <!ENTITY okular5-time          "0.7 SBU (using parallelism=4)">
+  <!ENTITY okular-download-http "&kf5apps-download-http;/okular-&kf5apps-version;.tar.xz">
+  <!ENTITY okular-download-ftp  " ">
+  <!ENTITY okular-md5sum        "b2ced60d37221bf1c4693e529aa0429d">
+  <!ENTITY okular-size          "8.2 MB">
+  <!ENTITY okular-buildsize     "93 MB">
+  <!ENTITY okular-time          "1.0 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="okular5" xreflabel="Okular-&kf5apps-version;">
-  <?dbhtml filename="okular5.html"?>
+<sect1 id="okular" xreflabel="Okular-&kf5apps-version;">
+  <?dbhtml filename="okular.html"?>
 
 
   <title>Okular-&kf5apps-version;</title>
 
-  <indexterm zone="okular5">
+  <indexterm zone="okular">
     <primary sortas="a-Okular">Okular</primary>
   </indexterm>
@@ -28 +28 @@
     <para>
       Okular is a document viewer for KDE. It can view documents of many types
-      including PDF, PostScript, TIFF, Microsoft CHM, DjVu, DVI, XPS and ePub.
+      including PDF, PostScript, TIFF, DjVu, DVI, XPS, and ePub.
     </para>
 
@@ -37 +37 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&okular5-download-http;"/>
+          Download (HTTP): <ulink url="&okular-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&okular5-download-ftp;"/>
+          Download (FTP): <ulink url="&okular-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &okular5-md5sum;
+          Download MD5 sum: &okular-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &okular5-size;
+          Download size: &okular-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &okular5-buildsize;
+          Estimated disk space required: &okular-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &okular5-time;
+          Estimated build time: &okular-time;
         </para>
       </listitem>
@@ -72 +72 @@
     <para role="required">
       <xref linkend="kf5-frameworks"/>
+      <xref linkend="plasma-activities"/>
     </para>
 
@@ -78 +79 @@
       <xref linkend="libkexiv2"/>,
       <xref linkend="libtiff"/>, and
-      <xref linkend="poppler"/> (built with Qt5, required for PDF support)
+      <xref linkend="poppler"/> (built with Qt6, required for PDF support)
     </para>
 
@@ -86 +87 @@
       <ulink url="https://www.pell.portland.or.us/~orc/Code/discount/">discount</ulink>,
       <ulink url="https://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="https://download.kde.org/stable/release-service/&kf5apps-version;/src/">
-                 kpimtextedit</ulink>,
       <ulink url="https://libspectre.freedesktop.org/">libspectre</ulink>
-                 (for PostScript support),
-      <ulink url="http://www.jedrea.com/chmlib">libchm</ulink>,
       <ulink url="https://sourceforge.net/projects/ebook-tools">libepub</ulink>, and
-      <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">
-                 Mobipocket</ulink>
+      <ulink url="https://libzip.org">LibZip</ulink>
     </para>
 
@@ -116 +112 @@
 cd    build &amp;&amp;
 
-SKIP_OPTIONAL='LibSpectre;CHM;LibZip;DjVuLibre;EPub;QMobipocket;Discount'
+SKIP_OPTIONAL='Discount;DjVuLibre;EPub;LibSpectre;LibZip'
 
 cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
@@ -150 +146 @@
         </seg>
         <seg>
-          libOkular5Core.so
+          Okular6Core.so
         </seg>
         <seg>
-          $KF5_PREFIX/include/okular,
-          $KF5_PREFIX/lib/cmake/Okular5,
-          $KF5_PREFIX/lib/plugins/okular,
-          $KF5_PREFIX/share/kxmlgui5/okular,
-          $KF5_PREFIX/share/okular,
-          $KF5_PREFIX/share/doc/HTML/*/okular, and
+          $KF6_PREFIX/include/okular,
+          $KF6_PREFIX/lib/cmake/Okular6,
+          $KF6_PREFIX/lib/plugins/okular,
+          $KF6_PREFIX/share/okular, and
+          $KF6_PREFIX/share/doc/HTML/*/okular
         </seg>
       </seglistitem>
@@ -168 +163 @@
       <?dbhtml list-presentation="table"?>
 
-     <varlistentry id="okular5-prog">
+     <varlistentry id="okular-prog">
         <term><command>okular</command></term>
         <listitem>
@@ -174 +169 @@
              is a document viewer
           </para>
-          <indexterm zone="okular5 okular5-prog">
+          <indexterm zone="okular okular-prog">
             <primary sortas="b-okular">okular</primary>
           </indexterm>

packages.ent

@@ -856 +856 @@
 <!ENTITY pangomm-version              "2.46.4">
 <!ENTITY qt5-version                  "5.15.12">
-<!ENTITY qtwebengine-version          "5.15.17">
+<!ENTITY qtwebengine-major            "6.6">
+<!ENTITY qtwebengine-version          "6.6.2">
 <!ENTITY qt6-version                  "6.6.2">
 <!ENTITY startup-notification-version "0.12">
@@ -920 +921 @@
 <!-- Chapter 32 -->
 <!ENTITY plasma5-version       "6.0.0">
+<!ENTITY plasma-version        "6.0.0">
 
 

postlfs/editors/kate.xml

@@ -4 +4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY kate5-download-http "&kf5apps-download-http;/kate-&kf5apps-version;.tar.xz">
-  <!ENTITY kate5-download-ftp  " ">
-  <!ENTITY kate5-md5sum        "46323fc33eea7a38816277b47b1fa08a">
-  <!ENTITY kate5-size          "7.7 MB">
-  <!ENTITY kate5-buildsize     "217 MB">
-  <!ENTITY kate5-time          "0.7 SBU (using parallelism=4)">
+  <!ENTITY kate-download-http "&kf5apps-download-http;/kate-&kf5apps-version;.tar.xz">
+  <!ENTITY kate-download-ftp  " ">
+  <!ENTITY kate-md5sum        "d368f1cb7acc4cb1f9f3eadb6fbd37ac">
+  <!ENTITY kate-size          "8.0 MB">
+  <!ENTITY kate-buildsize     "252 MB">
+  <!ENTITY kate-time          "1.0 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="kate5" xreflabel="Kate-&kf5apps-version;">
-  <?dbhtml filename="kate5.html"?>
+<sect1 id="kate" xreflabel="Kate-&kf5apps-version;">
+  <?dbhtml filename="kate.html"?>
 
 
   <title>Kate-&kf5apps-version;</title>
 
-  <indexterm zone="kate5">
+  <indexterm zone="kate">
     <primary sortas="a-Kate">Kate</primary>
   </indexterm>
@@ -27 +27 @@
     <para>
       The <application>Kate</application> package contains an advanced
-      KF5 based graphical text editor.
+      KF6 based graphical text editor.
     </para>
 
@@ -36 +36 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&kate5-download-http;"/>
+          Download (HTTP): <ulink url="&kate-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&kate5-download-ftp;"/>
+          Download (FTP): <ulink url="&kate-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &kate5-md5sum;
+          Download MD5 sum: &kate-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &kate5-size;
+          Download size: &kate-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &kate5-buildsize;
+          Estimated disk space required: &kate-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &kate5-time;
+          Estimated build time: &kate-time;
         </para>
       </listitem>
@@ -72 +72 @@
       <xref linkend="kf5-frameworks"/>
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <ulink url="https://libgit2.github.com/">libgit2</ulink>
     </para>
-
+-->
   </sect2>
 
@@ -91 +91 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX  \
+cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX  \
       -DCMAKE_BUILD_TYPE=Release          \
       -DBUILD_TESTING=OFF                 \
@@ -122 +122 @@
         </seg>
         <seg>
-          Several plugins under $KF5_PREFIX/lib/plugins
+          Several plugins under $KF6_PREFIX/lib/plugins
         </seg>
         <seg>
-          $KF5_PREFIX/lib/plugins/ktexteditor,
-          $KF5_PREFIX/lib/plugins/plasma/dataengine,
-          $KF5_PREFIX/share/doc/HTML/*/{kate,katepart,kwrite},
-          $KF5_PREFIX/share/{kateproject,katexmltools}, and
-          $KF5_PREFIX/share/plasma/plasmoids/org.kde.plasma.katesessions
+          $KF6_PREFIX/lib/plugins/ktexteditor,
+          $KF6_PREFIX/lib/plugins/plasma/dataengine,
+          $KF6_PREFIX/share/doc/HTML/*/{kate,katepart,kwrite},
+          $KF6_PREFIX/share/{kateproject,katexmltools}, and
+          $KF6_PREFIX/share/plasma/plasmoids/org.kde.plasma.katesessions
         </seg>
       </seglistitem>
@@ -139 +139 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="kate5-prog">
+      <varlistentry id="kate-prog">
         <term><command>kate</command></term>
         <listitem>
@@ -145 +145 @@
             is an advanced text editor for kde
           </para>
-          <indexterm zone="kate5 kate5-prog">
+          <indexterm zone="kate kate-prog">
             <primary sortas="b-kate">kate</primary>
           </indexterm>
@@ -151 +151 @@
       </varlistentry>
 
-      <varlistentry id="kwrite5">
+      <varlistentry id="kwrite">
         <term><command>kwrite</command></term>
         <listitem>
@@ -158 +158 @@
             <command>kate</command>
           </para>
-          <indexterm zone="kate5 kwrite5">
+          <indexterm zone="kate kwrite">
             <primary sortas="b-kwrite">kwrite</primary>
           </indexterm>

x/lib/lib.xml

@@ -77 +77 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-alternate.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-components.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt6.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebengine.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt6.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/> -->
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
 
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>-->
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>-->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tepl.xml"/>

x/lib/qtwebengine.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qtwebengine-major "5.15">
-<!-- URL if there is a public release
-  <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
-     URL for a prepared git version -->
-  <!ENTITY qtwebengine-download-http "&sources-anduin-http;/qtwebengine/qtwebengine-&qtwebengine-version;.tar.xz">
+  <!ENTITY qtwebengine-download-http "https://download.qt.io/official_releases/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "9f430acf599605c762a8098000155045">
-  <!ENTITY qtwebengine-size          "307 MB">
-  <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
-  <!ENTITY qtwebengine-time          "45 SBU (Using parallelism=8)">
+  <!ENTITY qtwebengine-md5sum        "593be964bad252a2b8e0052bc171175b">
+  <!ENTITY qtwebengine-size          "402 MB">
+  <!ENTITY qtwebengine-buildsize     "7.6 GB (231 MB installed)">
+  <!ENTITY qtwebengine-time          "51 SBU (Using parallelism=8)">
 ]>
 
 <sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
   <?dbhtml filename="qtwebengine.html"?>
-
 
   <title>QtWebEngine-&qtwebengine-version;</title>
@@ -43 +38 @@
       website designed for google chrome, or chromium, browsers.
     </para>
-
-    <important>
-      <para>
-        Qt-5.15 reached End Of Life on 26 May 2023. Extended lifetime Qt5.15 LTS
-        has been extended until 26th May 2025 for those with subscription licenses.
-        Because qtwebengine uses chromium code under the LGPL, it appears that any
-        new backported CVE fixes for QtWebEngine will be available after Qt makes
-        public releases of its current versions.
-      </para>
-    </important>
-
-    <warning>
-      <para>
-        QtWebEngine uses a forked copy of chromium, and is therefore vulnerable
-        to many issues found there. The Qt developers have always preferred to
-        make releases at the same time as the rest of Qt (rather than adding
-        emergency fixes), but with stable versions getting released after the
-        current development version. Now that they are keen to move to Qt6, the
-        5.15.3 and later Qt-5.15 releases are initially only available to paying
-        customers. QtWebEngine is something of an exception because of its LGPL
-        licence, but getting the git sources (with the forked chromium submodule)
-        to a position where they will successfully build on a current BLFS system
-        can take a lot of effort and therefore updates to the book may be delayed.
-      </para>
-
-      <para>
-        It seems likely that future 5.15-series versions will also be released
-        long after the chromium vulnerabilities are known, but fixes for
-        QtWebEngine can be found in git and the editors take the view that
-        known vulnerabilities in browsers should be fixed.
-      </para>
-
-      <para> <!-- for git versions -->
-        The tarball linked to below was created from the 5.15<!--.15--> git branch
-        and the 87-branch of the chromium submodule (which is forked from
-        chromium). See the GIT-VERSIONS file in the tarball for details of the
-        latest commits.
-      </para>
-    </warning>
-
-    <!-- note for editors on obtaining webengine from git.
-      First (if you do not already have a past version)
-      git clone git://code.qt.io/qt/qtwebengine.git
-      git submodule init -
-       that will report qtwebengine-chromium.git registered for src/3rdparty
-       now find the main branch names:
-      git fetch origin
-      git branch -r
-       after a release is prepared (even if the rest is not public), the 5.15
-       branch now seems to get updated and might be what you want. But in the
-       approach to 5.15.6 the backported CVE and other security fixes were only
-       applied to 5.15.6.  So, assuming that a 5.15.7 branch now exists,
-      git checkout origin/5.15.7
-       Confirm that HEAD is where you expected.
-       Now go to src/3rdparty
-      git fetch origin
-      git branch -r
-       The required branch is likely to be 87-branch unless there is a newer one
-      mentioned in the 5.15 cgit web page (below).
-      git checkout origin/87-branch (or whatever)
-       Use git log or git tk to look at its HEAD and check it seems appropriate.
-       If this doesn't work, use 'git submodule update'
-
-      To decide when it might be worth creating a new tarball, periodically keep
-      an eye on https://code.qt.io/cgit/qt/qtwebengine.git/ (currently, the 5.15.6
-      branch, 5.15.7 might get used later). The interesting items are CVE fixes
-      for known chromium vulnerabilities, as well as numbered Security bugs -
-      again, these relate to chromium.
-
-      When I noticed some updates in late March I was searching for one of the
-      CVEs mentioned, and google found a link to a review page for Michael Brüning
-      at https://codereview.qt-project.org/q/owner:michael.bruning%2540qt.io At that
-      time I could see various unmerged items, so I waited. The items for the
-      90-based chromium module are not relevant to 5.15-series (possibly they will
-      be for qtwebengine-6+). Review queues for other Qt employees might be found
-      in a similar way, but remember that everythng EXCEPT qtwebengine and chromium
-      is private to Qt until they choose to release it.
-
-      NOTE: the 3rdparty/chromium tree may contain more patches than have been
-      merged into the current 5.15.x branch. Any patches after what was in the
-      last 'update chromium' merge in qtwebengine occasionally break the build.
-
-      After merging the contents of the qtwebengine and src/3rdparty git extracts,
-      in the top level please create a GIT-VERSIONS file summarising the HEAD
-      commits of both parts, as a reminder of where we are up to. I've nove added
-      a CVE-fixes to keep track of what has been fixed (comits before 5.15.2 did not
-      mention the CVEs until they were detailed in a release).
-
-      Now create tarballs - 'git archive' does not work across submodule boundaries,
-      so you need to create one archive from the top of qtwebengine/ and another
-      from the top of src/3rdparty (chromium, gn, ninja are apparently all part of
-      the qtwebengine-chromium module).  Then in a work area untar the qtwebengine
-      tarball, go down to src/3rdparty and untar the submodule tarball.
-      Decide on what to call the result and create a full xz tarball using tar -cJf.
-
-      NOTE: To use git archive, use something like this:
-      git archive - -format tar.gz - -output qtwebengine.tar.gz HEAD
-      git archive - -format tar.gz - -output chromium.tar.gz HEAD
-
-      UPDATE: Since we have to host the tarball, and it is over 300MB, it makes
-      sense to create a patch for subsequent fixes (for the first version, 314KB
-      including the updates to the GIT-VERSIONS file).  For future updates, view
-      the current updates patch to see the previous commits. When the new commits
-      have been applied, rename the updated version to 'b', but untar the
-      unpatched tarball as 'a' and then diff a to b in the usual manner to get
-      all updates since the tarball was created.
-
-      For our own releases, probably best to create a fresh tarball.
-
-         end of note for editors -->
 
     &lfs121_checked;
@@ -171 +56 @@
       </para>
     </warning>
-
+<!--
     <note>
       <para>
@@ -193 +78 @@
       </para>
     </note>
-
+-->
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -228 +113 @@
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-  <!--<listitem>
+      <listitem>
         <para>
           Required patch:
@@ -239 +125 @@
           <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
         </para>
-      </listitem>-->
+      </listitem>
       <listitem>
         <para>
@@ -252 +138 @@
         </para>
       </listitem>
-      <!--
+  
       <listitem>
         <para>
@@ -259 +145 @@
         </para>
       </listitem>
-      -->
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-      <!-- the qmake output tends to be misleading. 'khr' is from Mesa -->
+
     <para role="required">
       <xref linkend="nodejs"/>,
       <xref linkend="nss"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="python311"/>, and
-      (<xref linkend='qt5'/> or
-       <xref role="nodep" linkend='qt5-components'/> with qtlocation and qtwebchannel)
+      <xref linkend="pciutils"/>, and
+      <xref linkend='qt6'/> 
     </para>
 
@@ -309 +193 @@
   <sect2 role="installation">
     <title>Installation of qtwebengine</title>
-
-<!-- following merely commented instead of deleted, in case we need to
-      drop back when a future version of python3 is released -->
-<!--<note>
-      <para>
-        Unlike version 5.15.2, the chromium-derived build system now needs
-        <command>python</command> to be available and to be python2. In
-        BLFS-10.1 the creation of the python symlink was removed as a step
-        towards eventually getting rid of python2 (other old packages which
-        need python2 usually work by invoking python2). If you are still
-        using an earlier version of BLFS where
-        <filename>/usr/bin/python</filename> exists, you can skip the
-        commands to create the symlink, and to later remove it.
-      </para>
-    </note>
-
-    <para>
-      First, as the <systemitem class="username">root</systemitem>
-      user, create the python symlink:
-    </para>
-
-<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>-->
-
-
-<!--<para>
-      Now apply a patch to update from 5.15.6 to the security and other fixes
-      contained in the 5.15.7 source:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-5.15.7-1.patch</userinput></screen>-->
-
-    <para>
-      Apply a patch to fix several issues that can prevent the build from completing,
-      and to force it to use python3:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-2.patch</userinput></screen>
-
-    <para>
-      If building with system <xref linkend='ffmpeg'/> as the editors
-      recommend, apply a patch that resolves problems when building with
-      ffmpeg-5 and later:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch</userinput></screen>
-
-    <!-- The ffmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb
-         already in system ffmpeg, but not this old shipped copy.
-         Not marked nodump because it won't affect the build with system
-         ffmpeg anyway.  -->
-
-    <!-- Now in build_fixes-2
-    <para>
-      Otherwise, fix an issue in shipped ffmpeg causing it fail to build
-      with Binutils 2.41 or later:
-    </para>
-
-<screen><userinput remap="pre">sed 's/(uint8_t)\(([^)]*)\|shift\)/\1 \&amp; 0x1F/' \
-    -i src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h</userinput></screen>
-    -->
-
-<!-- start of commands for git versions only -->
-    <para>
-      Although the build_fixes patch has ensured that git is not invoked during the build,
-      the build system has labyrinthine rules of byzantine complexity, and in
-      particular trying to build without two <filename>.git</filename> directories
-      will lead to it eventually falling into unexpected and unbuildable code
-      which references a private header that has not been created. Avoid this
-      by creating the required directories:
-    </para>
-
-<screen><userinput>mkdir -pv .git src/3rdparty/chromium/.git</userinput></screen>
-
-    <para>
-      Because this version of qtwebengine is aimed at a later release than the
-      current public releases, change it to build for qt-&qt5-version; using a
-      sed:
-    </para>
-
-<screen><userinput>sed -e '/^MODULE_VERSION/s/5.*/&qt5-version;/' -i .qmake.conf</userinput></screen>
-<!-- end of commands for git versions only -->
-
-    <para>
-      Now, ensure that the local headers are available when not building as
-      part of the complete <xref linkend="qt5"/>:
-    </para>
-
-<screen><userinput>find -type f -name "*.pr[io]" |
-  xargs sed -i -e 's|INCLUDEPATH += |&amp;$$QTWEBENGINE_ROOT/include |'</userinput></screen>
-
-    <para>
-      Next, allow the pulseaudio library to be linked at build time, instead
-      of run time. This also prevents an issue with newer pulseaudio:
-    </para>
-
-<screen><userinput>sed -e '/link_pulseaudio/s/false/true/' \
-    -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
-
-    <para>
-      Next, fix a build failure that occurs when libxml2-2.12.0 or later is
-      installed:
-      <!-- See Ticket #19246 -->
-    </para>
-
-<screen><userinput>sed -e 's/xmlError/const xmlError/' \
--i src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h \
--i src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc</userinput></screen>
-
-<!-- Now in build_fixes-2.patch (except Python 3.12 changes, those are commented
-     until we eventually move to Python 3.12 again for this package (though
-     hopefully by that point these issues will be resolved)
-    <para>
-      Next, fix the build tools so they can be run with Python-3.11+:
-    </para>
-
-<screen><userinput>sed -e 's/\^(?i)/(?i)^/' \
-    -i src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py &amp;&amp;
-
-sed -e "s/'rU'/'r'/" \
-    -i src/3rdparty/chromium/tools/grit/grit/util.py</userinput></screen>
-
-    <para>
-      Several fixes are needed for using Python-3.12+: first, either remove
-      references to the removed <command>imp</command> module or
-      replace it with the newer <command>importlib</command> module:
-    </para>
-
-<screen><userinput>sed -e "/import imp/d"                                                    \
-    -i src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py    \
-       src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py &amp;&amp;
-
-sed -e "s/import imp/import importlib.util/" \
-    -e 's@.*load_source.*@\
-    spec = importlib.util.spec_from_file_location(fullname, filepath)\
-    mod = importlib.util.module_from_spec(spec);\
-    spec.loader.exec_module(mod)\
-    return mod@'                             \
-    -i src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py</userinput></screen>
-
-    <note>
-      <para>
-        In the above instruction, the 4-space indentation of the four lines
-        from <command>spec = ...</command> to <command>return ...</command>
-        is significant, since they are in a Python script.
-      </para>
-    </note>
-
-    <para>
-      Remove an obsolete instance of and a reference to the
-      <command>six</command> module:
-    </para>
-
-<screen><userinput>sed -e /six.move/d \
-    -i src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py &amp;&amp;
-
-rm -r src/3rdparty/chromium/tools/grit/third_party/six</userinput></screen>
-
-    <para>
-      There is also a workaround needed for ICU-74+:
-    </para>
-
-<screen><userinput>sed -e 's/^#define BA_LB_COUNT.*$/#define BA_LB_COUNT 40/' \
-    -i src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc</userinput></screen>
--->
-
-<!-- In build_fixes-2.patch now
-    <para>
-      Finally, fix a change in the build system which allows its developers to
-      pass e.g. -j20 to make (for quick tests of some areas) but breaks the
-      build with LFS's use of the NINJAJOBS environment variable:
-    </para>
--->
-<!-- editors: See thread at
-http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/036996.html
-et.seq, particularly 037002.html which shows the commit near the end. -->
-
-<!--<screen><userinput>sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro</userinput></screen>-->
-
-<!-- now that we always install this as 5.15.2, this seems to be redundant
-    <para>
-      If an older version of the package's main library has been installed,
-      when the package is built separately it will link to that in preference
-      to its own not-yet-installed version, and fail because of missing symbols.
-      Prevent that by, as the <systemitem class="username">root</systemitem>
-      user, moving the symlink out of the way:
-    </para>
-
-<screen role="root"><userinput>if [ -e ${QT5DIR}/lib/libQt5WebEngineCore.so ]; then
-  mv -v ${QT5DIR}/lib/libQt5WebEngineCore.so{,.old}
-fi</userinput></screen>-->
-
-<!--<para>
-      The last fix is needed to build with gcc-12:
-    </para>
-
-<screen><userinput>sed -e '/#include/i#include &lt;vector&gt;' \
-    -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>-->
-
-<!-- PATH=[...] will cause /opt/python3.11/bin/python3.11 to be hardcoded into
-     the makefiles instead of whichever python is in /usr/bin -->
     <para>
       Install <application>qtwebengine</application> by running the following
@@ -516 +200 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
-PATH=/opt/python3.11/bin:$PATH qmake .. --                  \
-                                        -system-ffmpeg      \
-                                        -proprietary-codecs \
-                                        -webengine-icu      &amp;&amp;
-make</userinput></screen>
-
-<!--
-    <para>
-      if you wish to build the HTML documentation, issue:
-    </para>
-
-<screen><userinput>make docs</userinput></screen>
--->
+
+cmake -D CMAKE_MESSAGE_LOG_LEVEL=STATUS             \
+      -D QT_FEATURE_webengine_system_ffmpeg=ON      \
+      -D QT_FEATURE_webengine_system_icu=ON         \
+      -D QT_FEATURE_webengine_system_libevent=ON    \
+      -D QT_FEATURE_webengine_proprietary_codecs=ON \
+      -D QT_FEATURE_webengine_webrtc_pipewire=ON    \
+      -D QT_BUILD_EXAMPLES_BY_DEFAULT=OFF           \
+      -G Ninja .. &amp;&amp;
+
+ninja</userinput></screen>
+
     <para>
       This package does not come with a test suite.
@@ -540 +223 @@
 
     <!-- EDITORS NOTE: If you are updating this package, use INSTALL_ROOT=
-         instead of DESTDIR= -->
-<!--
-    <para>
-      If you built the HTML documentation, install it with:
-    </para>
-
-<screen role="root"><userinput>make install_docs</userinput></screen>
--->
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-<!--<para>
-      Finally, as the <systemitem class="username">root</systemitem>
-      user, remove the python symlink:
-    </para>
-
-<screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>-->
+         instead of DESTDIR=    Not sure this is valid any more with version 6.6.2 -->
   </sect2>
 
@@ -569 +230 @@
 
     <para>
-      <command>PATH=/opt/python3.11/bin:$PATH</command>: This switch forces
-      this package to use the version of Python 3.11 that is installed in /opt.
-      This is done to reduce the chances for problems that may occur during the
-      build, and to simplify the instructions since this package is incompatible
-      with Python 3.12 without additional modifications.
-      <!-- Ticket #19016 -->
-    </para>
-
-    <para>
-      <command>qmake</command>: This will build the included copy of
-      <application>ninja</application> if it is not already installed
-      and use it to configure the build.
-    </para>
-
-    <para>
-      <command>-- -system-ffmpeg -proprietary-codecs -webengine-icu</command>: If
-      any options are passed to qmake they must come after '--' which must follow
-      '..' that points to the main directory. The options here cause it to use
-      system ffmpeg and  system icu. The '-proprietary-codecs' option allows
-      ffmpeg to decode H264 and H265 codecs.  If built as part of full Qt5, the
-      system icu is automatically used (only) by Qt5Core if it is available, but
-      unless this option is used webengine will always use its shipped copy of icu,
-      adding time and space to the build.  Remove the
-      <parameter>-system-ffmpeg</parameter> switch if you don't have
-      <xref linkend='ffmpeg'/> installed and want to build this package
-      with an internal copy of ffmpeg.
-    </para>
-
-    <para>
-      <option>-webengine-jumbo-build 0</option>: If this is added to the qmake
-      command it will cause the 'Jumbo Build Merge Limit' to be reported as 'no'
-      instead of 8. That turns off the jumbo build. Some distros do that to get
-      a smaller build on some architectures such as MIPS. On x86_64 it might save
-      a little space in the build, but the build time will increase by a very
-      large amount.
-    </para>
-
-    <para>
-      <option>-webengine-kerberos</option>: Add this if you have installed <xref
-      linkend="mitkrb"/> and wish to connect from a browser using QtWebEngine
-      to a webserver which requires you to connect via kerberos.
-    </para>
-
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/SIOCGSTAMP.xml"/>
-    -->
+      <parameter>CMAKE_MESSAGE_LOG_LEVEL=STATUS</parameter>: Output
+      interesting messages that project users might be interested in.
+      Ideally these should be concise, no more than a single line, 
+      but still informative.
+    </para>
+
+    <para>
+      <parameter>QT_FEATURE_webengine_system_*</parameter>: Specify what
+      external packages the system should use.
+    </para>
+
+    <para>
+      <parameter>QT_BUILD_EXAMPLES_BY_DEFAULT=OFF</parameter>: Do not build
+      exampes by default.
+    </para>
 
     <para>
@@ -724 +353 @@
         <seg>
           qtwebengine_convert_dict and
-          QtWebEngineProcess (in $QT5DIR/libexec)
+          QtWebEngineProcess (both in $QT6DIR/libexec)
         </seg>
         <seg>
-          libQt5Pdf.so,
-          libQt5PdfWidgets.so,
-          libQt5WebEngineCore.so,
-          libQt5WebEngine.so, and
-          libQt5WebEngineWidgets.so
+          libQt6Pdf.so,
+          libQt6PdfQuick.so,
+          libQt6PdfWidgets.so,
+          libQt6WebEngineCore.so,
+          libQt6WebEngineiQuick.so,
+          libQt6WebEngineQuickDelegatesQml.so, and
+          libQt6WebEngineWidgets.so
         </seg>
         <seg>
-          $QT5DIR/include/QtPdf,
-          $QT5DIR/include/QtPdfWidgets,
-          $QT5DIR/include/QtWebEngine,
-          $QT5DIR/include/QtWebEngineCore,
-          $QT5DIR/include/QtWebEngineWidgets,
-          $QT5DIR/qml/QtWebEngine, and
-          $QT5DIR/translations/qtwebengine_locales
+          $QT6DIR/include/QtPdf,
+          $QT6DIR/include/QtPdfQuick,
+          $QT6DIR/include/QtPdfWidgets,
+          $QT6DIR/include/QtWebEngineCore,
+          $QT6DIR/include/QtWebEngineQuick,
+          $QT6DIR/include/QtWebEngineWidgets,
+          $QT6DIR/qml/QtWebEngine, and
+          $QT6DIR/translations/qtwebengine_locales
         </seg>
       </seglistitem>
@@ -776 +408 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libQtWebEngine-lib">
         <term><filename class="libraryfile">libQtWebEngine.so</filename></term>
@@ -813 +445 @@
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>
   </sect2>