Author: dj Date: Sun Oct 22 22:59:09 2017 New Revision: 19369 Log: Update to json-glib-1.4.2. Update to geocode-glib-3.25.4.1.
Modified: trunk/BOOK/general/genlib/json-glib.xml trunk/BOOK/gnome.ent trunk/BOOK/gnome/platform/geocode-glib.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/packages.ent Modified: trunk/BOOK/general/genlib/json-glib.xml ============================================================================== --- trunk/BOOK/general/genlib/json-glib.xml Sun Oct 22 22:33:18 2017 (r19368) +++ trunk/BOOK/general/genlib/json-glib.xml Sun Oct 22 22:59:09 2017 (r19369) @@ -4,12 +4,12 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/1.2/json-glib-&json-glib-version;.tar.xz"> - <!ENTITY json-glib-download-ftp "&gnome-download-ftp;/json-glib/1.2/json-glib-&json-glib-version;.tar.xz"> - <!ENTITY json-glib-md5sum "ff31e7d0594df44318e12facda3d086e"> - <!ENTITY json-glib-size "592 KB"> - <!ENTITY json-glib-buildsize "13 MB (with tests)"> - <!ENTITY json-glib-time "0.1 SBU (with tests)"> + <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/1.4/json-glib-&json-glib-version;.tar.xz"> + <!ENTITY json-glib-download-ftp "&gnome-download-ftp;/json-glib/1.4/json-glib-&json-glib-version;.tar.xz"> + <!ENTITY json-glib-md5sum "35107e23a7bbbc70f31c34f7b9adf1c3"> + <!ENTITY json-glib-size "164 KB"> + <!ENTITY json-glib-buildsize "8.6 MB (with tests)"> + <!ENTITY json-glib-time "less than 0.1 SBU (with tests)"> ]> <sect1 id="json-glib" xreflabel="JSON-GLib-&json-glib-version;"> @@ -101,26 +101,20 @@ commands: </para> -<screen><userinput>./configure --prefix=/usr && -make</userinput></screen> +<screen><userinput>mkdir build && +cd build && +meson --prefix /usr .. && +ninja</userinput></screen> <para> - To test the results, issue: <command>make check</command>. + To test the results, issue: <command>ninja test</command>. </para> <para> Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install</userinput></screen> - - </sect2> - - <sect2 role="commands"> - <title>Command Explanations</title> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="../../xincludes/gtk-doc-rebuild.xml"/> +<screen role="root"><userinput>ninja install</userinput></screen> </sect2> Modified: trunk/BOOK/gnome.ent ============================================================================== --- trunk/BOOK/gnome.ent Sun Oct 22 22:33:18 2017 (r19368) +++ trunk/BOOK/gnome.ent Sun Oct 22 22:59:09 2017 (r19369) @@ -21,6 +21,7 @@ <!ENTITY vte-version "0.50.1"> <!ENTITY yelp-xsl-version "3.20.1"> <!ENTITY GConf-version "3.2.6"> +<!ENTITY geocode-glib-version "3.25.4.1"> <!ENTITY gjs-version "1.50.1"> <!ENTITY gnome-autoar-version "0.2.2"> <!ENTITY gnome-desktop-version "3.24.2"> @@ -28,7 +29,6 @@ <!ENTITY libgtop-version "2.36.0"> <!ENTITY libpeas-version "1.20.0"> <!ENTITY libwnck-version "3.24.1"> -<!ENTITY geocode-glib-version "3.24.0"> <!ENTITY gnome-online-accounts-version "3.24.3"> <!ENTITY gnome-menus-version "3.13.3"> <!ENTITY grilo-version "0.3.4"> Modified: trunk/BOOK/gnome/platform/geocode-glib.xml ============================================================================== --- trunk/BOOK/gnome/platform/geocode-glib.xml Sun Oct 22 22:33:18 2017 (r19368) +++ trunk/BOOK/gnome/platform/geocode-glib.xml Sun Oct 22 22:59:09 2017 (r19369) @@ -5,12 +5,12 @@ %general-entities; <!ENTITY geocode-glib-download-http - "&gnome-download-http;/geocode-glib/&gnome-minor-24;/geocode-glib-&geocode-glib-version;.tar.xz"> + "&gnome-download-http;/geocode-glib/3.25/geocode-glib-&geocode-glib-version;.tar.xz"> <!ENTITY geocode-glib-download-ftp - "&gnome-download-ftp;/geocode-glib/&gnome-minor-24;/geocode-glib-&geocode-glib-version;.tar.xz"> - <!ENTITY geocode-glib-md5sum "9defe9329b13cdf44bcc31618c97d66e"> - <!ENTITY geocode-glib-size "404 KB"> - <!ENTITY geocode-glib-buildsize "6.4 MB (with tests)"> + "&gnome-download-ftp;/geocode-glib/3.25/geocode-glib-&geocode-glib-version;.tar.xz"> + <!ENTITY geocode-glib-md5sum "7315e7ff162dfd01165ba8a284e3eda6"> + <!ENTITY geocode-glib-size "80 KB"> + <!ENTITY geocode-glib-buildsize "2.3 MB (with tests)"> <!ENTITY geocode-glib-time "less than 0.1 SBU (with tests)"> ]> @@ -89,7 +89,6 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> - <xref linkend="git"/> and <xref linkend="gtk-doc"/> </para> @@ -101,25 +100,19 @@ <sect2 role="installation"> <title>Installation of Geocode GLib</title> -<!-- - <para> - First, apply a patch to fix the Makefile to not complain about nonexistent icons. - </para> - -<screen><userinput>patch -Np1 -i ../geocode-glib-&geocode-glib-version;-fix_icon_installation-1.patch</userinput></screen> ---> - <para> Install <application>Geocode GLib</application> by running the following commands: </para> -<screen><userinput>./configure --prefix=/usr && -make</userinput></screen> +<screen><userinput>mkdir build && +cd build && +meson --prefix /usr .. && +ninja</userinput></screen> <para> - To test the results, issue: <command>make -k check</command>. <!-- Note that + To test the results, issue: <command>ninja test</command>. <!-- Note that at least one test is known to fail for unknown reasons. --> </para> @@ -127,15 +120,7 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install</userinput></screen> - - </sect2> - - <sect2 role="commands"> - <title>Command Explanations</title> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="../../xincludes/gtk-doc-rebuild.xml"/> +<screen role="root"><userinput>ninja install</userinput></screen> </sect2> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Sun Oct 22 22:33:18 2017 (r19368) +++ trunk/BOOK/introduction/welcome/changelog.xml Sun Oct 22 22:59:09 2017 (r19369) @@ -46,6 +46,12 @@ <para>October 23rd, 2017</para> <itemizedlist> <listitem> + <para>[dj] - Update to geocode-glib-3.25.4.1.</para> + </listitem> + <listitem> + <para>[dj] - Update to json-glib-1.4.2.</para> + </listitem> + <listitem> <para>[dj] - Update to VTE-0.50.1.</para> </listitem> <listitem> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Sun Oct 22 22:33:18 2017 (r19368) +++ trunk/BOOK/packages.ent Sun Oct 22 22:59:09 2017 (r19369) @@ -121,7 +121,7 @@ <!ENTITY JS38-version "38.2.1"> <!ENTITY JS52-version "52.2.1gnome1"> <!ENTITY json-c-version "0.12.1"> -<!ENTITY json-glib-version "1.2.8"> +<!ENTITY json-glib-version "1.4.2"> <!ENTITY keyutils-version "1.5.10"> <!ENTITY libarchive-version "3.3.2"> <!ENTITY libassuan-version "2.4.3"> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page