Changeset 25b7f55 for gnome


Ignore:
Timestamp:
07/03/2019 03:30:43 AM (3 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
10.0, 10.1, 11.0, 9.0, 9.1, ken/refactor-virt, lazarus, qt5new, trunk, upgradedb, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
e78637d
Parents:
06bb4fd1
Message:

Reapply revision 21737, which was overwritten in the elogind merge. This contains an update to libchamplain-0.12.19, libgdata-0.17.10, spacing correction in grilo, and cleanup in telepathy-mission-control.

libgdata was partially applied because of r21749 which was merged into elogind before it became live. This has been fully corrected.

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

Location:
gnome/platform
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • gnome/platform/grilo.xml

    r06bb4fd1 r25b7f55  
    9595
    9696<screen><userinput>mkdir build &amp;&amp;
    97 cd build    &amp;&amp;
     97cd    build    &amp;&amp;
     98
    9899meson --prefix=/usr \
    99100      --libexecdir=/usr/lib .. &amp;&amp;
  • gnome/platform/libchamplain.xml

    r06bb4fd1 r25b7f55  
    99  <!ENTITY libchamplain-download-ftp
    1010           "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
    11   <!ENTITY libchamplain-md5sum        "52a410767f4797657b505e439bf7ce83">
    12   <!ENTITY libchamplain-size          "612 KB">
     11  <!ENTITY libchamplain-md5sum        "a3015b1f32d80d65515f8042ce595b30">
     12  <!ENTITY libchamplain-size          "228 KB">
    1313  <!ENTITY libchamplain-buildsize     "10 MB">
    1414  <!ENTITY libchamplain-time          "0.1 SBU">
     
    7979      <xref linkend="clutter"/>,
    8080      <xref linkend="clutter-gtk"/>,
    81       <xref linkend="gtk3"/>, and
    82       <xref linkend="libsoup"/>
     81      <xref linkend="gtk3"/>,
     82      <xref linkend="libsoup"/>, and
     83      <xref linkend="sqlite"/>
    8384    </para>
    8485
     
    107108    </para>
    108109
    109 <screen><userinput>./configure --prefix=/usr     \
    110             --enable-vala     \
    111             --disable-static  &amp;&amp;
    112 make</userinput></screen>
     110<!-- Because there is still rudimentary autotools support, there is already a
     111     build directory. Change into it and continue. -->
     112<screen><userinput>cd build &amp;&amp;
     113
     114meson --prefix=/usr .. &amp;&amp;
     115ninja</userinput></screen>
    113116
    114117    <para>
     
    120123    </para>
    121124
    122 <screen role="root"><userinput>make install</userinput></screen>
    123 
    124   </sect2>
    125 
     125<screen role="root"><userinput>ninja install</userinput></screen>
     126
     127  </sect2>
     128 
     129<!--
    126130  <sect2 role="commands">
    127131    <title>Command Explanations</title>
     
    140144
    141145  </sect2>
     146-->
    142147
    143148  <sect2 role="content">
     
    157162        </seg>
    158163        <seg>
    159           /usr/include/{libchamplain-0.12,libchamplain-gtk-0.12} and
    160           /usr/share/gtk-doc/html/{libchamplain-0.12,libchamplain-gtk-0.12}
     164          /usr/include/champlain-0.12 and
     165          /usr/share/gtk-doc/html/champlain-0.12
    161166        </seg>
    162167      </seglistitem>
  • gnome/platform/libgdata.xml

    r06bb4fd1 r25b7f55  
    77  <!ENTITY libgdata-download-http "&gnome-download-http;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
    88  <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
    9   <!ENTITY libgdata-md5sum        "cd41fec52a0f0ba999eb60025e0ac806">
    10   <!ENTITY libgdata-size          "1.4 MB">
    11   <!ENTITY libgdata-buildsize     "64 MB (with tests)">
    12   <!ENTITY libgdata-time          "0.7 SBU (with tests)">
     9  <!ENTITY libgdata-md5sum        "d858d411ad394c275643b14993dfeed4">
     10  <!ENTITY libgdata-size          "820 MB">
     11  <!ENTITY libgdata-buildsize     "73 MB (with tests)">
     12  <!ENTITY libgdata-time          "1.1 SBU (with tests)">
    1313]>
    1414
     
    118118
    119119    <para>
    120       To test the results, issue: <command>make check</command>. Note that
     120      To test the results, issue: <command>ninja test</command>. Note that
    121121      the tests need network access.
    122122    </para>
     
    126126    </para>
    127127
    128 <screen role="root"><userinput>make install</userinput></screen>
     128<screen role="root"><userinput>ninja install</userinput></screen>
    129129
    130130  </sect2>
     
    154154        </seg>
    155155        <seg>
    156           /usr/include/libgdata and
    157           /usr/share/gtk-doc/html/gdata
     156          /usr/include/libgdata,
     157          /usr/libexec/installed-tests/libgdata,
     158          /usr/share/gtk-doc/html/gdata, and
     159          /usr/share/installed-tests/libgdata
    158160        </seg>
    159161      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.