Changeset 5866da0


Ignore:
Timestamp:
04/21/2024 07:00:57 PM (3 weeks ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
lazarus, trunk
Children:
4fc802f
Parents:
18958f2e
Message:

General cleanup.

Remove a bunch of unneeded xml comments.
Remove refereces to qt5 where qt6 can be used.

Files:
12 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general/prog/cmake.xml

    r18958f2e r5866da0  
    9999      <xref linkend="mercurial"/> (for use during tests),
    100100      <xref linkend="openjdk"/> (for use during tests),
    101       &qt5-deps; or <xref linkend="qt6" role="nodep"/> (for the Qt-based GUI),
     101      <xref linkend="qt6"/> (for the Qt-based GUI),
    102102      <xref linkend="sphinx"/> (for building documents),
    103103      <xref linkend="subversion"/> (for testing),

  • lxqt/desktop/lxqt-kconfig.xml

    r18958f2e r5866da0  
    114114
    115115  </sect2>
    116 <!--
    117   <sect2 role="commands">
    118     <title>Command Explanations</title>
    119 
    120     <para>
    121       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    122       the default in extra-cmake-modules, which is <filename
    123       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    124     </para>
    125 
    126     <para>
    127       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    128       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    129       itself. Otherwise they get installed into <filename
    130       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    131     </para>
    132 
    133   </sect2>
    134 -->
     116
    135117  <sect2 role="content">
    136118    <title>Contents</title>

  • lxqt/desktop/lxqt-kidletime.xml

    r18958f2e r5866da0  
    117117
    118118  </sect2>
    119 <!--
    120   <sect2 role="commands">
    121     <title>Command Explanations</title>
    122119
    123     <para>
    124       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    125       the default in extra-cmake-modules, which is <filename
    126       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    127     </para>
    128 
    129     <para>
    130       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    131       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    132       itself. Otherwise they get installed into <filename
    133       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    134     </para>
    135 
    136   </sect2>
    137 -->
    138120  <sect2 role="content">
    139121    <title>Contents</title>

  • lxqt/desktop/lxqt-kwayland.xml

    r18958f2e r5866da0  
    117117
    118118  </sect2>
    119 <!--
    120   <sect2 role="commands">
    121     <title>Command Explanations</title>
    122119
    123     <para>
    124       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    125       the default in extra-cmake-modules, which is <filename
    126       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    127     </para>
    128 
    129     <para>
    130       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    131       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    132       itself. Otherwise they get installed into <filename
    133       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    134     </para>
    135 
    136   </sect2>
    137 -->
    138120  <sect2 role="content">
    139121    <title>Contents</title>

  • lxqt/desktop/lxqt-kwindowsystem.xml

    r18958f2e r5866da0  
    123123
    124124  </sect2>
    125 <!--
    126   <sect2 role="commands">
    127     <title>Command Explanations</title>
    128125
    129     <para>
    130       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    131       the default in extra-cmake-modules, which is <filename
    132       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    133     </para>
    134 
    135     <para>
    136       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    137       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    138       itself. Otherwise they get installed into <filename
    139       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    140     </para>
    141 
    142   </sect2>
    143 -->
    144126  <sect2 role="content">
    145127    <title>Contents</title>

  • lxqt/desktop/lxqt-layer-shell.xml

    r18958f2e r5866da0  
    113113
    114114<screen role="root"><userinput>make install</userinput></screen>
    115 <!--
    116     <para revision="sysv">
    117       Next, remove a systemd unit which serves no purpose on a SysV system as
    118       the &root; user:
    119     </para>
    120 
    121 <screen role="root" revision="sysv"><userinput>rm -v /usr/lib/systemd/user/plasma-kscreen.service</userinput></screen>
    122 -->
    123   </sect2>
    124 <!--
    125   <sect2 role="commands">
    126     <title>Command Explanations</title>
    127 
    128     <para>
    129       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    130       the default in extra-cmake-modules, which is <filename
    131       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    132     </para>
    133 
    134     <para>
    135       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    136       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    137       itself. Otherwise they get installed into <filename
    138       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    139     </para>
    140115
    141116  </sect2>
    142 -->
     117
    143118  <sect2 role="content">
    144119    <title>Contents</title>
    … …  
    163138      </seglistitem>
    164139    </segmentedlist>
    165 <!--
    166     <variablelist>
    167       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    168       <?dbfo list-presentation="list"?>
    169       <?dbhtml list-presentation="table"?>
    170140
    171       <varlistentry id="layer-shell-kscreen-doctor">
    172         <term><command>kscreen-doctor</command></term>
    173         <listitem>
    174           <para>
    175             allows modifying the screen setup from the command line
    176           </para>
    177           <indexterm zone="layer-shell-qt lxqt-layer-shell-kscreen-doctor">
    178             <primary sortas="b-kscreen-doctor">kscreen-doctor</primary>
    179           </indexterm>
    180         </listitem>
    181       </varlistentry>
    182 
    183       <varlistentry id="lxqt-layer-shell-lib">
    184         <term><filename class="libraryfile">libKF6Screen.so</filename></term>
    185         <listitem>
    186           <para>
    187             contains the KDE Screen Management library
    188           </para>
    189           <indexterm zone="lxqt-layer-shell-lib">
    190             <primary sortas="c-libKF6Screen">libKF6Screen.so</primary>
    191           </indexterm>
    192         </listitem>
    193       </varlistentry>
    194 
    195         <varlistentry id="lxqt-layer-shell-dpms-lib">
    196         <term><filename class="libraryfile">libKF6ScreenDpms.so</filename></term>
    197         <listitem>
    198           <para>
    199             contains API functions for handling DPMS
    200           </para>
    201           <indexterm zone="lxqt-layer-shell-dpms-lib">
    202             <primary sortas="c-libKF6ScreenDpms">libKF6ScreenDpms.so</primary>
    203           </indexterm>
    204         </listitem>
    205       </varlistentry>
    206     </variablelist>
    207 -->
    208141  </sect2>
    209142

  • lxqt/desktop/lxqt-libkscreen.xml

    r18958f2e r5866da0  
    121121
    122122  </sect2>
    123 <!--
    124   <sect2 role="commands">
    125     <title>Command Explanations</title>
    126123
    127     <para>
    128       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    129       the default in extra-cmake-modules, which is <filename
    130       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    131     </para>
    132 
    133     <para>
    134       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    135       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    136       itself. Otherwise they get installed into <filename
    137       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    138     </para>
    139 
    140   </sect2>
    141 -->
    142124  <sect2 role="content">
    143125    <title>Contents</title>

  • lxqt/desktop/lxqt-solid.xml

    r18958f2e r5866da0  
    127127
    128128  </sect2>
    129 <!--
    130   <sect2 role="commands">
    131     <title>Command Explanations</title>
    132129
    133     <para>
    134       <parameter>-DCMAKE_INSTALL_LIBEXECDIR=libexec</parameter>: This overrides
    135       the default in extra-cmake-modules, which is <filename
    136       class="directory">/usr/lib/libexec</filename> and is not FHS compliant.
    137     </para>
    138 
    139     <para>
    140       <parameter>-DKDE_INSTALL_USE_QT_SYS_PATHS=ON</parameter>: This forces
    141       installation of Qt plugins in the same directory as <xref linkend="qt5"/>
    142       itself. Otherwise they get installed into <filename
    143       class="directory">/usr/mkspecs</filename>, which is not FHS compliant.
    144     </para>
    145 
    146   </sect2>
    147 -->
    148130  <sect2 role="content">
    149131    <title>Contents</title>

  • lxqt/desktop/pre-install.xml

    r18958f2e r5866da0  
    3535        <para>
    3636          Second, build the required parts of Qt. The full package, <xref
    37           linkend="qt5"/> is quite long and has a lot of dependencies.  As an
    38           alternative, the required components needed for LXQt can be built
    39           using the procedures in <xref linkend="qt5-alternate"/>.
     37          linkend="qt6"/> is quite long and has a lot of dependencies.
    4038        </para>
    4139      </step>

  • x/lib/qtwebengine.xml

    r18958f2e r5866da0  
    8080      </para>
    8181    </warning>
    82 <!--
    83     <note>
    84       <para>
    85         If you  are upgrading and have installed a newer version of <xref
    86         linkend='icu'/> since you last installed <xref linkend='qt5'/>, you
    87         will need to reinstall Qt5 before upgrading, otherwise the final link
    88         of this package will fail with a warning that the version of icu
    89         libraries needed by libQt5Core.so may conflict with the version
    90         used for this package.
    91       </para>
    92 
    93       <para>
    94         Unusually, the shipped GN build system (used to create the Ninja files)
    95         requires a static <filename class="libraryfile">libstdc++.a</filename>
    96         although the installed libraries correctly use the shared version. If
    97         that static library is not present, the build will fail quite quickly.
    98         Please note that if you try to build webengine as part of
    99         <application>Qt</application> and the static library is not available,
    100         that build will either complete without installing webengine, or else
    101         fail during the install (both variants were observed in 5.12.0).
    102       </para>
    103     </note>
    104 -->
     82
    10583    <bridgehead renderas="sect3">Package Information</bridgehead>
    10684    <itemizedlist spacing="compact">

  • xsoft/office/libreoffice.xml

    r18958f2e r5866da0  
    272272      <xref linkend="mitkrb"/>,
    273273      <xref linkend="nasm"/>,
    274       &qt5-deps;,
    275274      <xref linkend="qt6"/>,
    276275      <xref linkend="sane"/>,

  • xsoft/other/transmission.xml

    r18958f2e r5866da0  
    8787    <para role="recommended">
    8888      <xref linkend="gtkmm4"/> or
    89       &qt5-deps; or
    90       <xref linkend="qt6" role="nodep"/>
     89      <xref linkend="qt6"/>
    9190    </para>
    9291
Note: See TracChangeset for help on using the changeset viewer.