Changeset 64c41e6

Timestamp:

04/09/2024 10:16:09 PM (5 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

lazarus, trunk

Children:

43b45a17

Parents:

b4609782

Message:

Update to qt6-6.7.0 and qtwebengine-6.7.0.

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/qt6.xml (modified) (4 diffs)
• x/lib/qtwebengine.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -42 +42 @@
       <para>April 9th, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to qt6-6.7.0 and qtwebengine-6.7.0. Fixes
+          <ulink url="&blfs-ticket-root;19575">#19575</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to gnome-maps-46.0. Fixes

packages.ent

@@ -877 +877 @@
 <!ENTITY pangomm-version              "2.46.4">
 <!ENTITY qt5-version                  "5.15.12">
-<!ENTITY qtwebengine-major            "6.6">
-<!ENTITY qtwebengine-version          "6.6.3">
-<!ENTITY qt6-version                  "6.6.3">
+<!ENTITY qtwebengine-major            "6.7">
+<!ENTITY qtwebengine-version          "6.7.0">
+<!ENTITY qt6-version                  "6.7.0">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY tepl-version                 "6.9.0">

x/lib/qt6.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qt6-major "6.6">
+  <!ENTITY qt6-major "6.7">
   <!ENTITY qt6-url   "https://download.qt.io/archive/qt/&qt6-major;/&qt6-version;/single">
 
   <!ENTITY qt6-download-http "&qt6-url;/qt-everywhere-src-&qt6-version;.tar.xz">
   <!ENTITY qt6-download-ftp  " ">
-  <!ENTITY qt6-md5sum        "0e2c9dd87cbc6768da2bfc7f776c272f">
-  <!ENTITY qt6-size          "764 MB">
-  <!ENTITY qt6-buildsize     "33 GB (354 MB installed)">
-  <!ENTITY qt6-time          "16 SBU (using parallelism=8)">
+  <!ENTITY qt6-md5sum        "4468b457adb3a96294947e601fc877ca">
+  <!ENTITY qt6-size          "891 MB">
+  <!ENTITY qt6-buildsize     "35 GB (358 MB installed)">
+  <!ENTITY qt6-time          "17 SBU (using parallelism=8)">
 ]>
 
@@ -225 +225 @@
         If <application>Qt6</application> is being reinstalled into the
         same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
+        &root;, such as
         <command>make install</command>, from a console or non-Qt6 based
         window manager. It overwrites <application>Qt6</application>
@@ -272 +272 @@
       </para>
     </note>
+
+    <para>
+      First make a correction identified uostream:
+    </para>
+
+<screen><userinput>sed -i '/if __cpp_lib_span/s/if/ifdef/' qtbase/src/corelib/tools/qspan.h</userinput></screen>
 
     <para>
@@ -314 +320 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <!-- Not sure this is correct for Qt6
-
-         EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
 
     <para>

x/lib/qtwebengine.xml

@@ -7 +7 @@
   <!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        "ba3fe1cb32f2a495d586bf573abec93a">
-  <!ENTITY qtwebengine-size          "402 MB">
-  <!ENTITY qtwebengine-buildsize     "7.6 GB (231 MB installed)">
-  <!ENTITY qtwebengine-time          "58 SBU (Using parallelism=8)">
+  <!ENTITY qtwebengine-md5sum        "d2a509bd4dc6bbf1272217292546cfce">
+  <!ENTITY qtwebengine-size          "525 MB">
+  <!ENTITY qtwebengine-buildsize     "8.5 GB (319 MB installed)">
+  <!ENTITY qtwebengine-time          "60 SBU (Using parallelism=8)">
 ]>