Changeset 8307474 for gnome/platform/gnome-settings-daemon.xml

Timestamp:

12/04/2021 03:28:15 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

lazarus

Children:

e6974d1

Parents:

b22e4ceb (diff), edd2feb7 (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 lazarus

File:

• gnome/platform/gnome-settings-daemon.xml (modified) (2 diffs)

gnome/platform/gnome-settings-daemon.xml

@@ -88 +88 @@
       <xref linkend="libgweather"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="librsvg"/>,
       <xref linkend="libwacom"/>,
       <xref linkend="pulseaudio"/>,
       <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
       <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
-      <xref linkend="upower"/>, and
-      <xref linkend="xorg-wacom-driver"/>
+      and <xref linkend="upower"/>
     </para>
 
@@ -153 +151 @@
     </para>
 
-<screen revision="systemd" role="root"><userinput remap="pre">rm -v /usr/lib/systemd/user/gsd-*</userinput></screen>
+<screen revision="systemd" role="root"><userinput remap="pre">rm -fv /usr/lib/systemd/user/gsd-*</userinput></screen>
+
+    <para>
+      Fix an issue with meson-0.60 and later:
+    </para>
+
+<screen><userinput>sed -i /b_ndebug/s/true/\'true\'/ meson.build</userinput></screen>
 
     <para>