Changeset 768a7aa for xsoft/office/libreoffice.xml

Timestamp:

05/29/2024 05:04:33 PM (4 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

12.2, gimp3, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128

Children:

2adbfb6e

Parents:

7b51d98

Message:

Libreoffice: update the command explanations to use KDE Plasma 6

This also includes changes to use Qt6 instead of Qt5 since we have no
more Qt5 DEs in the book.

File:

• xsoft/office/libreoffice.xml (modified) (7 diffs)

xsoft/office/libreoffice.xml

@@ -736 +736 @@
     </para>
 
-    <para>
-      <option>--enable-gtk3-kde5</option>: This switch allows the Visual Class
+<!-- This needs KF5, and has not been ported to KF6. However, enable-kf6 brings
+     in a new VCL plugin so that it works properly in Plasma 6, so it's not
+     needed.
+    <para>
+      <option>- -enable-gtk3-kde5</option>: This switch allows the Visual Class
       Library, which is responsible for widgets, to be built with KF5 file
       dialogs if GTK+-3, Qt5 and Plasma are all available.
     </para>
+-->
 
     <para>
@@ -770 +774 @@
     </para>
 
-    <para>
-      <!-- Brings in - -enable-qt5 as well. -->
-      <option>--enable-kf5</option>: Builds with KDE/Plasma integration. If
+<!-- We no longer carry KDE 5, so let's only cover KDE 6.
+    <para>
+      <option>- -enable-kf5</option>: Builds with KDE/Plasma integration. If
       &qt5-deps; and/or <xref linkend="kf6-frameworks"/> are not
       installed in <filename class="directory">/usr</filename>, the include
@@ -779 +783 @@
       respectively.
     </para>
-
+-->
     <para>
       <option>--enable-evolution2</option>: Enables support for Evolution
@@ -786 +790 @@
     </para>
 
-    <para>
-      <option>--enable-qt5</option>: This switch enables support for integration
+<!-- Let's not encourage the use of Qt5 since LXQt and Plasma now use Qt6.
+    <para>
+      <option>- -enable-qt5</option>: This switch enables support for integration
       with Qt5 and the Qt5 theming engine. If &qt5-deps; is not installed in
       <filename class="directory">/usr</filename>, the include and library
@@ -793 +798 @@
       <envar>QT5LIB</envar> environment variables.
     </para>
+-->
 
     <para>
@@ -803 +809 @@
 
     <para>
+      <option>--enable-kf6</option>: Builds with KDE/Plasma integration. If
+      <xref linkend="qt6"/> and/or <xref linkend="kf6-frameworks"/> are not
+      installed in <filename class="directory">/usr</filename>, the include
+      and library directories must be specified in <envar>QT6INC</envar>,
+      <envar>QT6LIB</envar>, <envar>KF6INC</envar>, and <envar>KF6LIB</envar>,
+      respectively. This includes a style plugin and KIO integration.
+    </para>
+
+    <para>
       <option>--with-system-abseil</option>: This switch enables using a system
       version of the Abseil C++ libraries instead of the bundled copy. Add this
@@ -808 +823 @@
       it instead of the bundled copy.
     </para>
-
-    <!-- For when we add KDE 6 to the book next cycle.
-    <para>
-      <!- - Brings in - -enable-qt5 as well. - ->
-      <option>- -enable-kf6</option>: Builds with KDE/Plasma integration. If
-      <xref linkend="qt6"/> and/or <xref linkend="kf6-frameworks"/> are not
-      installed in <filename class="directory">/usr</filename>, the include
-      and library directories must be specified in <envar>QT6INC</envar>,
-      <envar>QT6LIB</envar>, <envar>KF6INC</envar>, and <envar>KF6LIB</envar>,
-      respectively.
-    </para>
-    -->
 
   </sect2>