Changeset 4f406ea for x

Timestamp:

11/17/2022 07:58:32 AM (20 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

11c62aa

Parents:

41f908a (diff), 84f972c1 (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 plabs/python-mods

Location:

x

Files:

• installing/libxcvt.xml (modified) (1 diff)
• installing/mesa.xml (modified) (5 diffs)
• installing/x7app.xml (modified) (2 diffs)
• installing/x7lib.xml (modified) (3 diffs)
• installing/xwayland.xml (modified) (1 diff)
• lib/libdrm.xml (modified) (1 diff)
• lib/qtwebengine.xml (modified) (1 diff)
• wm/icewm.xml (modified) (1 diff)

x/installing/libxcvt.xml

@@ -125 +125 @@
         </seg>
         <seg>
-          /usr/include/libxcvt
+          $XORG_PREFIX/include/libxcvt
         </seg>
       </seglistitem>

x/installing/mesa.xml

@@ -7 +7 @@
   <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
   <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-md5sum        "b696316674c2007cdcc25e67e192aba8">
+  <!ENTITY mesa-md5sum        "06c329323a60f6eb6d4adc0d3971b0f4">
   <!ENTITY mesa-size          "16 MB">
-  <!ENTITY mesa-buildsize     "372 MB (with docs, add 230 MB for tests)">
-  <!ENTITY mesa-time          "2.2 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
+  <!ENTITY mesa-buildsize     "463 MB (with docs, add 230 MB for tests)">
+  <!ENTITY mesa-time          "2.5 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
 ]>
 
@@ -372 +372 @@
           libXvMCr600.so,
           libgbm.so,
-          libglapi.so,
-          <!-- No Vulkan driver anymore
-          libvulkan_intel.so,
-          libvulkan_lvp.so,
-          libvulkan_radeon.so,-->
-          libxatracker.so,
-          libXvMCnouveau.so, and
-          libXvMCr600.so
+          libglapi.so, and
+          libxatracker.so
         </seg>
         <seg>
@@ -386 +380 @@
                                           Direct3D -->
           crocus_dri.so,
-<!--          i830_dri.so,-->
           i915_dri.so,
           iris_dri.so,
@@ -395 +388 @@
           r600_dri.so,
           r600_drv_video.so,
-<!--          radeon_dri.so,-->
           radeonsi_dri.so,
           radeonsi_drv_video.so,
@@ -416 +408 @@
           $XORG_PREFIX/share/drirc.d (contains workarounds for various applications,
           particularly browsers and games),
-          <!--          $XORG_PREFIX/share/vulkan, -->
-          and
-          /usr/share/doc/mesa-&mesa-version;
+          and /usr/share/doc/mesa-&mesa-version;
         </seg>
       </seglistitem>

x/installing/x7app.xml

@@ -71 +71 @@
   <!ENTITY xkbcomp-md5sum                  "c45e9f7971a58b8f0faf10f6d8f298c0">
 
-  <!ENTITY xkbevd-version                  "1.1.4">
-  <!ENTITY xkbevd-md5sum                   "c747faf1f78f5a5962419f8bdd066501">
+  <!ENTITY xkbevd-version                  "1.1.5">
+  <!ENTITY xkbevd-md5sum                   "05ce1abd8533a400572784b1186a44d0">
 
   <!ENTITY xkbutils-version                "1.0.5">
   <!ENTITY xkbutils-md5sum                 "cf65ca1aaf4c28772ca7993cfd122563">
 
-  <!ENTITY xkill-version                   "1.0.5">
-  <!ENTITY xkill-md5sum                    "938177e4472c346cf031c1aefd8934fc">
-
-  <!ENTITY xlsatoms-version                "1.1.3">
-  <!ENTITY xlsatoms-md5sum                 "61671fee12535347db24ec3a715032a7">
-
-  <!ENTITY xlsclients-version              "1.1.4">
-  <!ENTITY xlsclients-md5sum               "4fa92377e0ddc137cd226a7a87b6b29a">
+  <!ENTITY xkill-version                   "1.0.6">
+  <!ENTITY xkill-md5sum                    "f62b99839249ce9a7a8bb71a5bab6f9d">
+
+  <!ENTITY xlsatoms-version                "1.1.4">
+  <!ENTITY xlsatoms-md5sum                 "da5b7a39702841281e1d86b7349a03ba">
+
+  <!ENTITY xlsclients-version              "1.1.5">
+  <!ENTITY xlsclients-md5sum               "ab4b3c47e848ba8c3e47c021230ab23a">
 
   <!ENTITY xmessage-version                "1.0.6">
@@ -229 +229 @@
 &xinput-md5sum;  xinput-&xinput-version;.tar.bz2
 &xkbcomp-md5sum;  xkbcomp-&xkbcomp-version;.tar.bz2
-&xkbevd-md5sum;  xkbevd-&xkbevd-version;.tar.bz2
+&xkbevd-md5sum;  xkbevd-&xkbevd-version;.tar.xz
 &xkbutils-md5sum;  xkbutils-&xkbutils-version;.tar.xz
-&xkill-md5sum;  xkill-&xkill-version;.tar.bz2
-&xlsatoms-md5sum;  xlsatoms-&xlsatoms-version;.tar.bz2
-&xlsclients-md5sum;  xlsclients-&xlsclients-version;.tar.bz2
+&xkill-md5sum;  xkill-&xkill-version;.tar.xz
+&xlsatoms-md5sum;  xlsatoms-&xlsatoms-version;.tar.xz
+&xlsclients-md5sum;  xlsclients-&xlsclients-version;.tar.xz
 &xmessage-md5sum;  xmessage-&xmessage-version;.tar.xz
 &xmodmap-md5sum;  xmodmap-&xmodmap-version;.tar.xz

x/installing/x7lib.xml

@@ -14 +14 @@
   <!ENTITY xtrans-md5sum                   "ce2fb8100c6647ee81451ebe388b17ad">
 
-  <!ENTITY libX11-version                  "1.8.1">
-  <!ENTITY libX11-md5sum                   "6b20033f88f0be3d870449c47f1e10a8">
+  <!ENTITY libX11-version                  "1.8.2">
+  <!ENTITY libX11-md5sum                   "702517860961584bd20253e3d3a42052">
 
   <!ENTITY libXext-version                 "1.3.5">
@@ -299 +299 @@
                   --with-appdefaultdir=/etc/X11/app-defaults
     ;;
-
+    <!--
     libX11-* )
       ./configure $XORG_CONFIG $docdir \
-                  --disable-thread-safety-constructor
-    ;;
+                  - -disable-thread-safety-constructor
+    ;;-->
 
     * )
@@ -403 +403 @@
           <envar>$XORG_PREFIX</envar>/share/doc/libICE,
           <envar>$XORG_PREFIX</envar>/share/doc/libSM,
-          <envar>$XORG_PREFIX</envar>/share/doc/libX11,
+          <envar>$XORG_PREFIX</envar>/share/doc/libX11-&libX11-version;,
           <envar>$XORG_PREFIX</envar>/share/doc/libXaw,
           <envar>$XORG_PREFIX</envar>/share/doc/libXext,

x/installing/xwayland.xml

@@ -7 +7 @@
   <!ENTITY xwayland-download-http "&xorg-download-http;/xserver/xwayland-&xwayland-version;.tar.xz">
   <!ENTITY xwayland-download-ftp  "&xorg-download-ftp;/xserver/xwayland-&xwayland-version;.tar.xz">
-  <!ENTITY xwayland-md5sum        "6b5c98278b362958f66fd9690c6df988">
+  <!ENTITY xwayland-md5sum        "fb0a4d8d924f701a12f6df5ca9673741">
   <!ENTITY xwayland-size          "1.2 MB">
   <!ENTITY xwayland-buildsize     "63 MB (add 357 MB for tests)">

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        "34a4dcf7eaf0c771b3b0757b5fd5f803">
-  <!ENTITY libdrm-size          "446 KB">
-  <!ENTITY libdrm-buildsize     "9 MB (with tests)">
+  <!ENTITY libdrm-md5sum        "07759750351465e5dd39f4fe40f000ea">
+  <!ENTITY libdrm-size          "464 KB">
+  <!ENTITY libdrm-buildsize     "8.2 MB (with tests)">
   <!ENTITY libdrm-time          "0.1 SBU (with tests)">
   <!-- With version 2.4.102, the tests add 1 second to my build. -->

x/lib/qtwebengine.xml

@@ -387 +387 @@
 <screen><userinput>sed -e '/link_pulseaudio/s/false/true/' \
     -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
+
+    <para>
+      Next, fix the build tools so they can be run with Python-3.11+:
+    </para>
+
+<screen><userinput>sed -e 's/\^(?i)/(?i)^/' \
+    -i src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py &amp;&amp;
+sed -e "s/'rU'/'r'/" \
+    -i src/3rdparty/chromium/tools/grit/grit/util.py</userinput></screen>
 
     <para>

x/wm/icewm.xml

@@ -7 +7 @@
   <!ENTITY icewm-download-http "https://github.com/ice-wm/icewm/archive/&icewm-version;/icewm-&icewm-version;.tar.gz">
   <!ENTITY icewm-download-ftp  " ">
-  <!ENTITY icewm-md5sum        "2221e9f6e8472120f05db907b8485182">
+  <!ENTITY icewm-md5sum        "77e302e33d2b5352ecdeb13ce0bcffcb">
   <!ENTITY icewm-size          "2.3 MB">
   <!ENTITY icewm-buildsize     "45 MB">