Changeset 7d55a6a

Timestamp:

05/12/2024 01:01:04 PM (11 days ago)

Author:

Thomas Trepl <thomas@…>

Branches:

lazarus

Parents:

a722d59

Message:

1) Textual changes
2) Let QT5 go...

Files:

• general/prog/fpc.xml (modified) (2 diffs)
• general/prog/lazarus.xml (modified) (4 diffs)
• general/prog/prog.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)

general/prog/fpc.xml

@@ -191 +191 @@
       </para>
       <para>
-        Even a temporary binary compiler must be installed prior to
-        compile the compiler from the source, it is assumed that the
-        <application>FreePascal</application> sources has been
-        extracted and the current directory has been changed to it just
-        like as usual.
+        A temporary binary compiler must be installed prior to
+        compile the compiler from the source. It is assumed that
+        the <application>FreePascal</application> sources has been
+        extracted and the current directory has been changed to it
+        just like as usual.
       </para>
       <para>
@@ -339 +339 @@
     <para>
       If you are going to use QT (most likely when building Lazarus
-      with the QT library), add the QT library path to the config as the
-      <systemitem class="username">root</systemitem> user:
+      with the QT library), make sure QT6DIR ist set prior to running
+      the following command. Add the QT library path to the config as
+      the <systemitem class="username">root</systemitem> user:
     </para>
     
-<screen role="root"><userinput>sed -e "/^-Fl\/usr\/lib\/fpc/a -Fl/opt/qt5/lib" \
+<screen role="root"><userinput>sed -e "/^-Fl\/usr\/lib\/fpc/a -Fl&qt6-dir;/lib" \
     -i /etc/fpc.cfg</userinput></screen>
 

general/prog/lazarus.xml

@@ -8 +8 @@
       NOTE:
       Whenever upgrading to another version of Lazarus,
-      update qt5pas.xml, too!
+      update qt5pas.xml and qt6pas.xml, too!
   -->
   <!ENTITY lazarus-download-http "https://downloads.sourceforge.net/project/lazarus/Lazarus Zip _ GZip/Lazarus &lazarus-version;/lazarus-&lazarus-version;-0.tar.gz">
@@ -69 +69 @@
     <bridgehead renderas="sect3">Lazarus Dependencies</bridgehead>
     <para role="required">
-      <xref linkend="fpc"/>, and one of 
-      <xref linkend="qt5"/> and <xref linkend="qt5pas"/> for QT5 based IDE,
-      <xref linkend="qt6"/> and <xref linkend="qt6pas"/> for QT6 based IDE,
+      <xref linkend="fpc"/>, and
+      <xref linkend="qt6"/> plus <xref linkend="qt6pas"/> for QT6 based IDE,
       or
       <xref linkend="gtk3"/> for Gtk3 based IDE
@@ -91 +90 @@
 
 <!--
-  Looks like that even both versions (gtk3, qt5) can be on one machine
-  when the binaries 'lazarus' and 'startlazarus' are moved to
+  Looks like that even multible versions (gtk3, qt5, qt6) can be on
+  one machine at the same time when the binaries 'lazarus' and
+  'startlazarus' are moved to
+  
     lazarus      -> lazarus-gtk3
     startlazarus -> startlazarus-gtk3
+
   and after building the QT5 variant
+
     lazarus      -> lazarus-qt5
     startlazarus -> startlazarus-qt5
+
   and than symlink lazarus/startlazarus to the desired ones.
-  (it needs to be analyzed more deeply)
-
-  Instructions are taken from ArchLinux and adopted to LFS
 -->
     <para>
       If you want to build <application>Lazarus</application> with
       the gtk3 toolkit, build the package by running the following
-      commands, otherwise skip the following instructions and proceed
-      to the instructions to build the QT5 based variant below.
-    </para>
-
+      commands, otherwise skip the GTK instructions and proceed
+      to the instructions to build the QT based variant below.
+    </para>
+
+    <para>Built GTK based IDE:</para>
 <screen><userinput>make -j1 FPC=/usr/bin/fpc LCL_PLATFORM=gtk3 bigide</userinput></screen>
 
     <para>
-      If the gtk3 variant has bee built, skip the QT5 and QT6 section and
-      proceed to the installation.
-      Otherwise <application>Lazarus</application> is to be built using
-      the QT5 library by running the following commands:
-    </para>
-
+      Now proceed to the installation (meaning skip the QT build below).
+    </para>
+
+<!-- QT5 fades out of BLFS ...    
+    <para>Built Qt5 based IDE:</para>
 <screen><userinput>make -j1 FPC=/usr/bin/fpc LCL_PLATFORM=qt5 bigide</userinput></screen>
 
@@ -124 +125 @@
       Now proceed to the installation.
     </para>
+-->
     
-    <para>
-      <application>Lazarus</application> can also be built using the
-      QT6 library. Build it in similar way:
-    </para>
+    <para>Built Qt6 based IDE:</para>
 <screen><userinput>make -j1 FPC=/usr/bin/fpc LCL_PLATFORM=qt6 bigide</userinput></screen>
 
     <para>
-      Likewise, a gtk2 variant can be built in similar way - just use
-      LCL_PLATFORM=gtk2 in the <code>make ... bigide</code> command. It
-      is not included here as gtk2 is quite outdated and no longer included
-      in the BLFS book.
+      Likewise, a gtk2 or a qt5 variant can be built in similar way - just use
+      LCL_PLATFORM=gtk2 resp. LCL_PLATFORM=qt5 in the <code>make ... bigide</code>
+      command. It is not included here as gtk2 and qt5 are outdated
+      and no longer included in the BLFS book.
     </para>
 

general/prog/prog.xml

@@ -22 +22 @@
   <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf213.xml"/-->
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/> -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cbindgen.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cbindgen.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
@@ -75 +75 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-fpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5pas.xml"/>
+  <!-- QT5 is fading out of BLFS .... -->
+  <!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5pas.xml"/ -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt6pas.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lazarus.xml"/>

packages.ent

@@ -400 +400 @@
 <!ENTITY lazarus-chksum               "75b871d4d19d08570d2f282b0d8fed0e">
 <!ENTITY lazarus-pkgsize              "83.7 MB">
-<!ENTITY qt5pas-version               "&lazarus-version;">
+<!-- ENTITY qt5pas-version               "&lazarus-version;"-->
 <!ENTITY qt6pas-version               "&lazarus-version;">