Changeset 76d24bf

Timestamp:

02/01/2023 12:07:30 AM (4 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.3, ken/inkscape-core-mods, qt5new, trunk

Children:

53d92c8, 949b48a

Parents:

569925c (diff), cede1f0 (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' of git.linuxfromscratch.org:blfs into trunk

Files:

• general/genutils/ibus.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/x7driver-vmware.xml (modified) (3 diffs)
• x/wm/openbox.xml (modified) (1 diff)

general/genutils/ibus.xml

@@ -105 +105 @@
       <xref linkend="dbus-python"/> and
       <xref linkend="pygobject3"/> (both to build the Python support library),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="pyxdg" role="runtime"/>
+      <xref linkend="gtk-doc"/>, and
+      <!--<xref linkend="pyxdg" role="runtime"/>
       (runtime, for the <command>ibus-setup</command>), and
+      NOTE: The reference to the 'xdg' python module is commented out in the source -->
       <xref linkend="libxkbcommon"/>,
       <xref linkend="wayland"/> (both to build the Wayland support programs), and

introduction/welcome/changelog.xml

@@ -43 +43 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to xf86-video-vmware-13.4.0. Fixes
+          <ulink url="&blfs-ticket-root;17558">#17558</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to libgusb-0.4.4. Fixes
           <ulink url="&blfs-ticket-root;17580">#17580</ulink>.</para>

x/installing/x7driver-vmware.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY xorg-vmware-driver-version "13.3.0">
+  <!ENTITY xorg-vmware-driver-version "13.4.0">
 
-  <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-md5sum        "08d66d062055080ff699ab4869726ea2">
-  <!ENTITY xorg-vmware-driver-size          "464 KB">
+  <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.xz">
+  <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.xz">
+  <!ENTITY xorg-vmware-driver-md5sum        "8c9ec4decaa2262eb33a474219232bb1b">
+  <!ENTITY xorg-vmware-driver-size          "408 KB">
   <!ENTITY xorg-vmware-driver-buildsize     "12 MB">
   <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
@@ -106 +106 @@
       <title>Installation of Xorg VMware Driver</title>
 
+<!--  Applied in 13.4.0
       <para>
         First, fix a bug revealed by gcc-12:
@@ -111 +112 @@
 
 <screen><userinput>sed -i 's/>yuv.i/>yuv[j][i/' vmwgfx/vmwgfx_tex_video.c</userinput></screen>
+-->
 
       <para>

x/wm/openbox.xml

@@ -78 +78 @@
       <xref linkend="imagemagick"/> (to show desktop backgrounds as seen in the
       Configuration Information section below),
-      <xref linkend="pyxdg"/>,
+      <xref linkend="pyxdg"/>, <!-- used for openbox-xdg-autostart -->
       <xref linkend="startup-notification"/>, and
       <xref linkend="librsvg"/>