Changeset 0913f48 for general/genlib

Timestamp:

03/30/2012 07:22:43 PM (12 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

fcf1326d

Parents:

8500ee0

Message:

gdk-pixbuf 2.26.0, cogl, gobject-introspection, glib and vala instruction fixes

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9816 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general/genlib

Files:

• glib2.xml (modified) (3 diffs)
• gobject-introspection.xml (modified) (3 diffs)

general/genlib/glib2.xml

@@ -66 +66 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libffi"/> and <xref linkend="python2"/>
-    <!--<para role="required"><xref linkend="pkgconfig"/> -->
     </para> 
 
@@ -148 +147 @@
     architecture dependent header file where programs can find it.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
     <para><parameter>--with-pcre=system</parameter>: This parameter causes the
     build to use a system-provided version of the
     <application>PCRE</application> library instead of an internal
     version.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -196 +195 @@
 
       <seglistitem>
-        <seg>gdbus, gdbus-codegen, gio-querymodules,
-        glib-compile-resources, glib-compile-schemas,
-        glib-genmarshal, glib-gettextize, glib-mkenums,
-        gobject-query, gresource, gsettings, gtester 
-        and gtester-report</seg>
-        <seg>libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
-        libgobject-2.0.so, libgthread-2.0.so and libgiofam.so</seg>
-        <seg>/usr/{include/{gio-unix-2.0/gio,glib-2.0/{gio,glib,gobject}},
-        lib/{gdbus-2.0/codegen,gio/modules,glib-2.0/include},share/
-        {gdb/auto-load,glib-2.0/{gdb,gettext/po},gtk-doc/html/
-        {gio,glib,gobject}}}</seg>
+        <seg>
+          gdbus, gdbus-codegen, gio-querymodules,
+          glib-compile-resources, glib-compile-schemas,
+          glib-genmarshal, glib-gettextize, glib-mkenums,
+          gobject-query, gresource, gsettings, gtester 
+          and gtester-report
+        </seg>
+
+        <seg>
+          libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
+          libgobject-2.0.so, libgthread-2.0.so and libgiofam.so
+        </seg>
+
+        <seg>
+          /usr/include/{gio-unix-2.0/gio,glib-2.0/{gio,glib,gobject}},
+          /usr/lib/{gdbus-2.0/codegen,gio/modules,glib-2.0/include},
+          /usr/share/glib-2.0/{gdb,gettext/po} and
+          /usr/share/gtk-doc/html/{gio,glib,gobject}
+        </seg>
       </seglistitem>
     </segmentedlist>

general/genlib/gobject-introspection.xml

@@ -61 +61 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libffi"/>,
-      <xref linkend="pkgconfig"/> and
-      <xref linkend="python2"/>
-    </para>
+    <para role="required"><xref linkend="pkgconfig"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -120 +116 @@
 
       <seglistitem>
-
         <seg>
           g-ir-annotation-tool, g-ir-compiler, g-ir-generate and g-ir-scanner
@@ -129 +124 @@
         </seg>
         
-        <seg>/usr/include/gobject-introspection-1.0,
-             /usr/lib/{girepository-1.0,gobject-introspection/giscanner},
-             /usr/lib/share/{gir-1.0,gobject-introspection-1.0/tests,
-            gtk-doc/html/gi}
+        <seg>
+          /usr/include/gobject-introspection-1.0,
+          /usr/lib/{girepository-1.0,gobject-introspection/giscanner},
+          /usr/share/{gir-1.0,gobject-introspection-1.0/tests} and
+          /usr/share/gtk-doc/html/gi
         </seg>
       </seglistitem>