Changeset ca041f6

Timestamp:

11/04/2017 05:04:08 PM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:

749b269

Parents:

7d3ca94a

Message:

Correct glib2 instructions. Add descriptive warning (without instructions) for upgrade fix.

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

Files:

• general.ent (modified) (2 diffs)
• general/genlib/glib2.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "03">                   <!-- Always 2 digits -->
+<!ENTITY day          "04">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 3rd, &year;">
+<!ENTITY releasedate  "November 4th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/genlib/glib2.xml

@@ -77 +77 @@
       <listitem>
         <para>
-          Required file:
-          <ulink url=
-"https://raw.githubusercontent.com/GNOME/glib/master/gio/tests/gengiotypefuncs.py"/>
+          Required patch:
+          <ulink url="&patch-root;/glib-&glib2-version;-meson_fixes-1.patch"/>
         </para>
       </listitem>
@@ -154 +153 @@
 <screen><userinput>patch -Np1 -i ../glib-&glib2-version;-skip_warnings-1.patch</userinput></screen>
 
+    <warning>
+      <para>
+        If upgrading from a previous version of GLib that was built using
+        autotools, and the <application>libtool</application> archives were
+        installed, you will need to adjust all installed libtool archives to
+        replace references to the libtool archives for this package,
+        <filename>/usr/lib/libg{io,lib,module,object,thread}-2.0.la</filename>,
+        with the appropriate linker library flag (-l),
+        <command>-lg{io,lib,module,object,thread}</command>. 600+ files must
+        be modified on a complete gnome desktop.
+<!--        Issue the following commands as the
+        <systemitem class="username">root</systemitem> user: -->
+      </para>
+
+<!-- Sorry, I broke my system berore I was able to fully test these commands
+     Feel free to test and uncomment if sane (I believe they are, but will
+     not introduce to end-users until it is tested thoroughly). - DJ
+
+<screen>if test -f /usr/lib/libglib-2.0.la; then
+    mkdir /usr/lib/la-file-backup &amp;&amp;
+    for lafile in /usr/lib/libg{io,lib,module,object,thread}-2.0.la; do
+        mv "${lafile}" /usr/lib/la-file-backup/$(basename "${lafile}").bak
+    done &amp;&amp;
+    for file in `find /usr/lib -name "*.la"`; do
+        grep -q '/usr/lib/libg\(io\|module\|lib\|object\|thread\)-2.0.la' \
+             "${file}" &amp;&amp;
+        sed -e 's@/usr/lib/libg\(io\|module\|lib\|object\|thread\)-2.0.la@-lg\1@g' \
+            -i.bak "${file}" &amp;&amp;
+        mv -v "${file}.bak" /usr/lib/la-file-backup
+    done
+fi</screen>-->
+    </warning>
+
     <para>
       Install <application>GLib</application> by running the following
@@ -159 +191 @@
     </para>
 
-<screen><userinput>cp ../gengiotypefuncs.py gio/tests &amp;&amp;
-
-sed -i 's/54.0/54.2/' meson.build &amp;&amp;
+<screen><userinput>patch -Np1 -i ../glib-&glib2-version;-meson_fixes-1.patch &amp;&amp;
 
 mkdir build-glib &amp;&amp;

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>November 4th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Correct installation of GLib-2.54.2 when using meson and
+          allow for upgrade when previous installation was from autotooled
+          build. Thanks to Chris Staub and archetech for assistance with the
+          upgrade instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 3rd, 2017</para>
       <itemizedlist>