Changeset 8f16a204

Timestamp:

01/18/2022 12:53:48 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, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f56eb466

Parents:

5a828aaa

Message:

Fixes gcr and dconf-editor for building with meson 0.61

Files:

• gnome/platform/dconf.xml (modified) (2 diffs)
• gnome/platform/gcr.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)

gnome/platform/dconf.xml

@@ -208 +208 @@
 cd dconf-editor-&dconf-editor-version;                &&
 
+sed -e '/  desktop,/d' \
+    -e '/  appdata,/d' \
+    -i editor/meson.build &&
+
 mkdir build &&
 cd    build &&
@@ -232 +236 @@
       <application>GTK-Doc</application> is installed and you wish to rebuild
       and install the API documentation.
+    </para>
+
+    <para><!-- Using screen so that spaces are output verbatim -->
+      <screen><command>sed -e '/  desktop,/d' ...</command></screen>: This
+      fixes a failure to build with newer versions of
+      <application>meson</application>.
     </para>
 

gnome/platform/gcr.xml

@@ -114 +114 @@
     </caution>
     -->
+
+    <para>
+      First apply a fix for building with newer versions of
+      <application>meson</application>:
+    </para>
+
+<screen><userinput>find . -name meson.build | xargs sed -i /packages.\*deps/d</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>January 18th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Apply fixes to dconf-editor and gcr to be
+          able to build with newer versions of meson.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 17th, 2022</para>
       <itemizedlist>