Changeset 9408066

Timestamp:

03/27/2012 12:10:48 AM (12 years ago)

Author:

Andrew Benton <andy@…>

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:

783061b6

Parents:

1228252

Message:

Gconf 3.2.5
Added a sed to fix compiling with glib-2.32 and gobject-introspection installed

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

Files:

• general.ent (modified) (1 diff)
• gnome/core/gconf.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -705 +705 @@
 <!-- Libraries -->
 <!ENTITY caribou-version              "0.4.1">
-<!ENTITY GConf-version                "3.2.3">
+<!ENTITY GConf-version                "3.2.5">
 <!ENTITY gjs-version                  "1.30.0">
 <!ENTITY gnome-desktop-version        "3.2.1">

gnome/core/gconf.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY GConf-download-http "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
-  <!ENTITY GConf-download-ftp  "&gnome-download-ftp;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
-  <!ENTITY GConf-md5sum        "de9047c08d3f642c5b1990b0bef44577">
+  <!ENTITY GConf-download-http
+  "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
+  <!ENTITY GConf-download-ftp
+  "&gnome-download-ftp;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
+  <!ENTITY GConf-md5sum        "1b803eb4f8576c572d072692cf40c9d8">
   <!ENTITY GConf-size          "1.5 MB">
-  <!ENTITY GConf-buildsize     "47 MB">
+  <!ENTITY GConf-buildsize     "42 MB">
   <!ENTITY GConf-time          "0.3 SBU">
 ]>
@@ -33 +35 @@
     configuration database system.</para>
 
-    &lfs70_built;
+    &lfs71_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72 +74 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/> and
+    <para role="optional"><xref linkend="openldap"/>,
+    <xref linkend="gobject-introspection"/> and
     <xref linkend="gtk-doc"/></para>
 
@@ -88 +91 @@
     <!-- with-gtk=3.0 is the default, and mandir goes to prefix/share/man -->
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+<screen><userinput>sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#' gconf/Makefile.in &amp;&amp;
+./configure --prefix=$GNOME_PREFIX \
             --sysconfdir=$GNOME_SYSCONFDIR \
             --libexecdir=$GNOME_PREFIX/lib/GConf \
-            --disable-orbit &amp;&amp;
+            --disable-orbit \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -168 +173 @@
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
+    <para><command>sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#'
+    gconf/Makefile.in</command>: This sed fixes compiling with both
+    <application>Glib-2.32</application> and
+    <xref linkend="gobject-introspection"/> installed.</para>
+
     <para><parameter>--libexecdir=<envar>$GNOME_PREFIX</envar>/lib/GConf</parameter>:
     This parameter causes the libexec files to be installed in the preferred
@@ -181 +191 @@
     href="../../xincludes/gnome-mandir.xml"/>-->
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
+    <para><option>--disable-static</option>: This switch prevents the static
     libraries being installed.</para>
 

introduction/welcome/changelog.xml

@@ -70 +70 @@
           <para>[abenton] - Epdfview 0.1.8.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - Gconf 3.2.5.</para>
+        </listitem>
       </itemizedlist>
     </listitem>