Changeset 89f74953

Timestamp:

11/20/2021 07:56:57 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.1, 11.2, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

4b852e51

Parents:

de66d05

git-author:

Pierre Labastie <pierre.labastie@…> (11/20/2021 07:46:58 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (11/20/2021 07:56:57 PM)

Message:

gnome-settings-daemon: fixes:

• add a sed for meson-0.60
• remove dependency on xorg-wacom-driver
• use rm -f for a file that may not be present

File:

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

gnome/platform/gnome-settings-daemon.xml

@@ -93 +93 @@
       <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 +152 @@
     </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>