Changeset 3a579120 for x

Timestamp:

11/29/2023 08:46:34 AM (7 months ago)

Author:

Ken Moffat <ken@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, trunk, xry111/llvm18

Children:

9c1319c

Parents:

f57d8fc (diff), 1b9bf3e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into ken/tuningfonts

Location:

x/lib

Files:

• libdrm.xml (modified) (3 diffs)
• qt6.xml (modified) (2 diffs)
• qtwebengine.xml (modified) (1 diff)
• webkitgtk.xml (modified) (3 diffs)

x/lib/libdrm.xml

@@ -7 +7 @@
   <!ENTITY libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.xz">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "69b17be6250b2c863411e0c5f6aefd6a">
+  <!ENTITY libdrm-md5sum        "f7bd81d394af513ed8a67e3ea178bb54">
   <!ENTITY libdrm-size          "468 KB">
-  <!ENTITY libdrm-buildsize     "7.9 MB (with tests)">
+  <!ENTITY libdrm-buildsize     "8.5 MB (with tests)">
   <!ENTITY libdrm-time          "less than 0.1 SBU (with tests)">
   <!-- With version 2.4.102, the tests add 1 second to my build. -->
@@ -98 +98 @@
     <title>Installation of Libdrm</title>
 
+<!--
     <para>
       First fix a problem building the libdrm_intel library:
@@ -103 +104 @@
 
 <screen><userinput>sed -i '/not.*system/s/system/cpu_family/' meson.build</userinput></screen>
+-->
 
     <para>

x/lib/qt6.xml

@@ -10 +10 @@
   <!ENTITY qt6-download-http "&qt6-url;/qt-everywhere-src-&qt6-version;.tar.xz">
   <!ENTITY qt6-download-ftp  " ">
-  <!ENTITY qt6-md5sum        "efc59647689c2548961a7312d075baf6">
-  <!ENTITY qt6-size          "775 MB">
-  <!ENTITY qt6-buildsize     "32 GB (376 MB installed)">
+  <!ENTITY qt6-md5sum        "91aad0b55cf01be5a08ca9bece490f39">
+  <!ENTITY qt6-size          "776 MB">
+  <!ENTITY qt6-buildsize     "31 GB (356 MB installed)">
   <!ENTITY qt6-time          "14 SBU (using parallelism=8)">
 ]>
@@ -275 +275 @@
       </para>
     </note>
-
-    <para>
-      The libxkbcommon-1.6.0 package removes some definitions that are not used.  Remove 
-      those here:
-    </para>
-
-    <screen><userinput>sed -i '242,245d' qtbase/src/gui/platform/unix/qxkbcommon.cpp</userinput></screen>
 
     <para>

x/lib/qtwebengine.xml

@@ -353 +353 @@
     <para>
       If building with system <xref linkend='ffmpeg'/> as the editors
-      recommand, apply a patch that resolves problems when building with
+      recommend, apply a patch that resolves problems when building with
       ffmpeg-5 and later:
     </para>

x/lib/webkitgtk.xml

@@ -69 +69 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -75 +74 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-consolidated_fixes-1.patch"/>
+          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
@@ -170 +168 @@
     </important>
 
-<!--
-    <para>
-      First, fix several security vulnerabilities and some runtime problems
-      when running in a virtual machine:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-consolidated_fixes-1.patch</userinput></screen>
--->
+    <para>
+      First, fix a build failure caused by libxml2-2.12.x:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>