Changeset b8a30db0

Timestamp:

01/15/2022 08:01:30 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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:

34623f0e

Parents:

d2e8024 (diff), 7a26ad4 (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/genlib/gobject-introspection.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/genlib/gobject-introspection.xml

@@ -72 +72 @@
       </listitem>
     </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch for building with meson version 0.61+:
+          <ulink url="&patch-root;/gobject-introspection-&gobject-introspection-version;-build_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GObject Introspection Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -98 +110 @@
   <sect2 role="installation">
     <title>Installation of GObject Introspection</title>
+
+    <para>
+      First apply a patch that allows building with meson version 0.61 or
+      above:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../gobject-introspection-&gobject-introspection-version;-build_fix-1.patch</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -54 +54 @@
         </listitem>
         <listitem>
+          <para>[pierre] - Apply upstream patch to gobject-introspection
+          to allow building with meson version 0.61 or above.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to shadow-4.11.1. Fixes
           <ulink url="&blfs-ticket-root;15916">#15916</ulink>.</para>