Author: dj
Date: Wed Jun 26 20:30:58 2019
New Revision: 21742
Log:
Merge to HEAD 21741.
Modified:
branches/BOOK-elogind/gnome.ent
branches/BOOK-elogind/gnome/platform/evolution-data-server.xml
branches/BOOK-elogind/gnome/platform/libgweather.xml
branches/BOOK-elogind/introduction/welcome/changelog.xml
branches/BOOK-elogind/x/lib/at-spi2-core.xml
Modified: branches/BOOK-elogind/gnome.ent
==============================================================================
--- branches/BOOK-elogind/gnome.ent Wed Jun 26 20:12:23 2019 (r21741)
+++ branches/BOOK-elogind/gnome.ent Wed Jun 26 20:30:58 2019 (r21742)
@@ -40,7 +40,7 @@
<!ENTITY libgweather-version "3.32.1">
<!ENTITY libpeas-version "1.22.0">
<!ENTITY libwnck-version "3.32.0">
-<!ENTITY evolution-data-server-version "3.32.1">
+<!ENTITY evolution-data-server-version "3.32.3">
<!ENTITY folks-version "0.12.1">
<!ENTITY gfbgraph-version "0.2.3">
<!ENTITY tracker-version "2.2.2">
Modified: branches/BOOK-elogind/gnome/platform/evolution-data-server.xml
==============================================================================
--- branches/BOOK-elogind/gnome/platform/evolution-data-server.xml Wed Jun
26 20:12:23 2019 (r21741)
+++ branches/BOOK-elogind/gnome/platform/evolution-data-server.xml Wed Jun
26 20:30:58 2019 (r21742)
@@ -8,10 +8,10 @@
"&gnome-download-http;/evolution-data-server/&gnome-minor-32;/evolution-data-server-&evolution-data-server-version;.tar.xz">
<!ENTITY evolution-data-server-download-ftp
"&gnome-download-ftp;/evolution-data-server/&gnome-minor-32;/evolution-data-server-&evolution-data-server-version;.tar.xz">
- <!ENTITY evolution-data-server-md5sum
"8832c259a5914b6a27ba4abde681254a">
+ <!ENTITY evolution-data-server-md5sum
"de4bd459d977d86f8be189b9fe60636e">
<!ENTITY evolution-data-server-size "4.4 MB">
<!ENTITY evolution-data-server-buildsize "194 MB">
- <!ENTITY evolution-data-server-time "1.9 SBU">
+ <!ENTITY evolution-data-server-time "1.8 SBU">
]>
<sect1 id="evolution-data-server"
@@ -126,7 +126,23 @@
the following commands:
</para>
-<screen><userinput>mkdir build &&
+<screen revision="sysv"><userinput>mkdir build &&
+cd build &&
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DENABLE_VALA_BINDINGS=ON \
+ -DENABLE_INSTALLED_TESTS=ON \
+ -DENABLE_GOOGLE=ON \
+ -DWITH_OPENLDAP=OFF \
+ -DWITH_KRB5=OFF \
+ -DENABLE_INTROSPECTION=ON \
+ -DENABLE_GTK_DOC=OFF \
+ -DWITH_SYSTEMDSYSTEMUNITDIR= \
+ .. &&
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=/usr \
Modified: branches/BOOK-elogind/gnome/platform/libgweather.xml
==============================================================================
--- branches/BOOK-elogind/gnome/platform/libgweather.xml Wed Jun 26
20:12:23 2019 (r21741)
+++ branches/BOOK-elogind/gnome/platform/libgweather.xml Wed Jun 26
20:30:58 2019 (r21742)
@@ -128,7 +128,7 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>-Dgtk_doc</option>: Use this parameter if
+ <para><option>-Dgtk_doc=true</option>: Use this parameter if
<application>GTK-Doc</application> is installed and you wish to rebuild and
install the API documentation.</para>
Modified: branches/BOOK-elogind/introduction/welcome/changelog.xml
==============================================================================
--- branches/BOOK-elogind/introduction/welcome/changelog.xml Wed Jun 26
20:12:23 2019 (r21741)
+++ branches/BOOK-elogind/introduction/welcome/changelog.xml Wed Jun 26
20:30:58 2019 (r21742)
@@ -44,6 +44,22 @@
<listitem>
<para>June 26th, 2019</para>
<itemizedlist>
+ <listitem revision="systemd">
+ <para>[renodr] - Update to evolution-data-server-3.32.3. Part of
+ <ulink url="&blfs-ticket-root;12025">#12025</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[renodr] - Disable the installation of systemd unit files in
+ at-spi2-core on SysV systems.</para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>[renodr] - Update to libgdata-0.17.10. Fixes
+ <ulink url="&blfs-ticket-root;12195">#12195</ulink>.</para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>[renodr] - Update to libchamplain-0.12.19. Fixes
+ <ulink url="&blfs-ticket-root;11706">#11706</ulink>.</para>
+ </listitem>
<listitem>
<para>[renodr] - Update to newt-0.52.21. Fixes
<ulink url="&blfs-ticket-root;12103">#12103</ulink>.</para>
Modified: branches/BOOK-elogind/x/lib/at-spi2-core.xml
==============================================================================
--- branches/BOOK-elogind/x/lib/at-spi2-core.xml Wed Jun 26 20:12:23
2019 (r21741)
+++ branches/BOOK-elogind/x/lib/at-spi2-core.xml Wed Jun 26 20:30:58
2019 (r21742)
@@ -113,7 +113,15 @@
commands:
</para>
-<screen><userinput>mkdir build &&
+<screen revision="sysv"><userinput>mkdir build &&
+cd build &&
+
+meson --prefix=/usr \
+ --sysconfdir=/etc \
+ -Dsystemd_user_dir=no .. &&
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &&
cd build &&
meson --prefix=/usr --sysconfdir=/etc .. &&
@@ -134,15 +142,20 @@
</sect2>
-<!--
- <sect2 role="commands">
+
+ <sect2 role="commands" revision="sysv">
<title>Command Explanations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/gtk-doc-rebuild.xml"/>
+ <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/gtk-doc-rebuild.xml"/> -->
+
+ <para>
+ <parameter>-Dsystemd_user_dir=no</parameter>: This flag disables the
+ installation of systemd unit files on SysV, where they are unable to be
+ used.
+ </para>
</sect2>
--->
<sect2 role="content">
<title>Contents</title>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
