Author: dj
Date: Sat Dec 22 10:19:04 2018
New Revision: 20853
Log:
Merge to HEAD 20852
Modified:
branches/BOOK-elogind/general.ent
branches/BOOK-elogind/general/genlib/libassuan.xml
branches/BOOK-elogind/general/genlib/nodejs.xml
branches/BOOK-elogind/general/genutils/highlight.xml
branches/BOOK-elogind/general/graphlib/libjpeg-turbo.xml
branches/BOOK-elogind/general/prog/llvm.xml
branches/BOOK-elogind/introduction/welcome/changelog.xml
branches/BOOK-elogind/multimedia/audioutils/cdparanoia.xml
branches/BOOK-elogind/multimedia/libdriv/alsa-tools.xml
branches/BOOK-elogind/multimedia/libdriv/pulseaudio.xml
branches/BOOK-elogind/multimedia/videoutils/ffmpeg.xml
branches/BOOK-elogind/networking/netprogs/wpa_supplicant.xml
branches/BOOK-elogind/packages.ent
branches/BOOK-elogind/postlfs/virtualization/qemu.xml
branches/BOOK-elogind/pst/printing/cups-filters.xml
branches/BOOK-elogind/x/installing/libinput.xml
branches/BOOK-elogind/x/wm/openbox.xml
branches/BOOK-elogind/xsoft/other/gimp.xml
branches/BOOK-elogind/xsoft/other/gparted.xml
branches/BOOK-elogind/xsoft/other/inkscape.xml
Modified: branches/BOOK-elogind/general.ent
==============================================================================
--- branches/BOOK-elogind/general.ent Fri Dec 21 20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/general.ent Sat Dec 22 10:19:04 2018 (r20853)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "17"> <!-- Always 2 digits -->
+<!ENTITY day "21"> <!-- Always 2 digits -->
<!ENTITY month "12"> <!-- Always 2 digits -->
<!ENTITY year "2018">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "December 17th, &year;">
+<!ENTITY releasedate "December 21st, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: branches/BOOK-elogind/general/genlib/libassuan.xml
==============================================================================
--- branches/BOOK-elogind/general/genlib/libassuan.xml Fri Dec 21 20:15:14
2018 (r20852)
+++ branches/BOOK-elogind/general/genlib/libassuan.xml Sat Dec 22 10:19:04
2018 (r20853)
@@ -8,9 +8,9 @@
<!-- Something is wrong with ftp server and it confuses curl when currency
runs it -->
<!-- <!ENTITY libassuan-download-ftp
"&gnupg-ftp;/libassuan/libassuan-&libassuan-version;.tar.bz2"> -->
<!ENTITY libassuan-download-ftp " ">
- <!ENTITY libassuan-md5sum "4354b7ae296894f232ada226a062d7d7">
- <!ENTITY libassuan-size "552 KB">
- <!ENTITY libassuan-buildsize "5.7 MB (with tests)">
+ <!ENTITY libassuan-md5sum "4d0d5738936bd8f4f0287e1dd80432b6">
+ <!ENTITY libassuan-size "560 KB">
+ <!ENTITY libassuan-buildsize "5.9 MB (with tests)">
<!ENTITY libassuan-time "less than 0.1 SBU (with tests)">
]>
Modified: branches/BOOK-elogind/general/genlib/nodejs.xml
==============================================================================
--- branches/BOOK-elogind/general/genlib/nodejs.xml Fri Dec 21 20:15:14
2018 (r20852)
+++ branches/BOOK-elogind/general/genlib/nodejs.xml Sat Dec 22 10:19:04
2018 (r20853)
@@ -84,7 +84,8 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="python2"/>
+ <xref linkend="python2"/> and
+ <xref linkend="which"/>
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
Modified: branches/BOOK-elogind/general/genutils/highlight.xml
==============================================================================
--- branches/BOOK-elogind/general/genutils/highlight.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/general/genutils/highlight.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -6,7 +6,7 @@
<!ENTITY highlight-download-http
"http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2";>
<!ENTITY highlight-download-ftp " ">
- <!ENTITY highlight-md5sum "7ef509379b41886c706b89183112e5f8">
+ <!ENTITY highlight-md5sum "d41acae977026cdfeec59e342cbe48ae">
<!ENTITY highlight-size "1.3 MB">
<!ENTITY highlight-buildsize "20 MB">
<!ENTITY highlight-time "0.3 SBU (Using paralllelism=4)">
Modified: branches/BOOK-elogind/general/graphlib/libjpeg-turbo.xml
==============================================================================
--- branches/BOOK-elogind/general/graphlib/libjpeg-turbo.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/general/graphlib/libjpeg-turbo.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -127,20 +127,20 @@
<screen role="root"><userinput>make install</userinput></screen>
</sect2>
-<!--
+
<sect2 role="commands">
<title>Command Explanations</title>
<para>
- <parameter>- -with-jpeg8</parameter>: This switch enables compatibility
+ <parameter>-DWITH_JPEG8=ON</parameter>: This switch enables compatibility
with <application>libjpeg</application> version 8.
</para>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/static-libraries.xml"/>
-
- </sect2>
-->
+ </sect2>
+
<sect2 role="content">
<title>Contents</title>
Modified: branches/BOOK-elogind/general/prog/llvm.xml
==============================================================================
--- branches/BOOK-elogind/general/prog/llvm.xml Fri Dec 21 20:15:14 2018
(r20852)
+++ branches/BOOK-elogind/general/prog/llvm.xml Sat Dec 22 10:19:04 2018
(r20853)
@@ -7,18 +7,18 @@
<!ENTITY llvm-majmin "7.0"> <!-- used in an explanation -->
<!ENTITY llvm-download-http
"http://llvm.org/releases/&llvm-version;/llvm-&llvm-version;.src.tar.xz";>
<!ENTITY llvm-download-ftp " ">
- <!ENTITY llvm-md5sum "e0140354db83cdeb8668531b431398f0">
- <!ENTITY llvm-size "28 MB">
- <!ENTITY llvm-buildsize "2.8 GB (with Clang, 670MB installed, add 16 GB
for tests)">
- <!ENTITY llvm-time "26 SBU (with Clang and parallelism=4, add 8 SBU
for tests)">
+ <!ENTITY llvm-md5sum "79f1256f97d52a054da8660706deb5f6">
+ <!ENTITY llvm-size "27 MB">
+ <!ENTITY llvm-buildsize "1.8 GB (with Clang, 670MB installed, add 16 GB
for tests)">
+ <!ENTITY llvm-time "20 SBU (with Clang and parallelism=4, add 8 SBU
for tests)">
<!ENTITY clang-download-http
"http://llvm.org/releases/&llvm-version;/cfe-&llvm-version;.src.tar.xz";>
- <!ENTITY clang-md5sum "2ac5d8d78be681e31611c5e546e11174">
+ <!ENTITY clang-md5sum "8583c9fb2af0ce61a7154fd9125363c1">
<!ENTITY clang-size "12 MB">
<!ENTITY rt-version "&llvm-version;">
<!ENTITY compiler-rt-download-http
"http://llvm.org/releases/&rt-version;/compiler-rt-&rt-version;.src.tar.xz";>
- <!ENTITY compiler-rt-md5sum "3b759c47076298363f4443395e0e51c1">
+ <!ENTITY compiler-rt-md5sum "697b70141ae7cc854e4fbde1a07b7287">
<!ENTITY compiler-rt-size "1.8 MB">
]>
Modified: branches/BOOK-elogind/introduction/welcome/changelog.xml
==============================================================================
--- branches/BOOK-elogind/introduction/welcome/changelog.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/introduction/welcome/changelog.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -41,6 +41,55 @@
</itemizedlist>
</listitem>
-->
+ <listitem>
+ <para>December 21st, 2018</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to llvm-7.0.1. Fixes
+ <ulink url="&blfs-ticket-root;11453">#11453</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to highlight-3.48. Fixes
+ <ulink url="&blfs-ticket-root;11450">#11450</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to gparted-0.33.0. Fixes
+ <ulink url="&blfs-ticket-root;11448">#11448</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to libassuan-2.5.2. Fixes
+ <ulink url="&blfs-ticket-root;11446">#11446</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to qemu-3.1.0. Fixes
+ <ulink url="&blfs-ticket-root;11224">#11224</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>December 20th, 2018</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to wpa_supplicant-2.7. Fixes
+ <ulink url="&blfs-ticket-root;11405">#11405</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[timtas] - Update to ffmpeg-4.1. Fixes
+ <ulink url="&blfs-ticket-root;11310">#11310</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>December 19th, 2018</para>
+ <itemizedlist>
+ <listitem>
+ <para>[renodr] - Fix Inkscape build and generate a consolidated
+ patch to make maintenance easier.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>December 18th, 2018</para>
Modified: branches/BOOK-elogind/multimedia/audioutils/cdparanoia.xml
==============================================================================
--- branches/BOOK-elogind/multimedia/audioutils/cdparanoia.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/multimedia/audioutils/cdparanoia.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -117,7 +117,7 @@
chmod -v 755 /usr/lib/libcdda_*.so.0.10.2</userinput></screen>
</sect2>
-
+ <!--
<sect2 role="configuration">
<title>Configuring CDParanoia</title>
@@ -130,7 +130,11 @@
</sect3>
</sect2>
-
+ As far as I can tell, no other packages have this information. The
+ instructions above all assume that the libraries are installed in /usr
+ (see the chmod... and prefix=/usr above). I believe this information
+ is redundant/useless for this package, so I'm commenting it out. -renodr
+ -->
<sect2 role="content">
<title>Contents</title>
Modified: branches/BOOK-elogind/multimedia/libdriv/alsa-tools.xml
==============================================================================
--- branches/BOOK-elogind/multimedia/libdriv/alsa-tools.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/multimedia/libdriv/alsa-tools.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -309,7 +309,7 @@
<term><command>init_audigy*</command></term>
<listitem>
<para>
- are tools used to initialize Creative cards.
+ are tools used to initialize Creative Sound Blaster Audigy-series
cards.
</para>
<indexterm zone="alsa-tools init_audigy_progs">
<primary sortas="b-init_audigy_progs">init_audigy*</primary>
@@ -321,7 +321,7 @@
<term><command>init_live</command></term>
<listitem>
<para>
- is a tool used to initialize Creative cards.
+ is a tool used to initialize Creative Sound Blaster Live cards.
</para>
<indexterm zone="alsa-tools init_live">
<primary sortas="b-init_live">init_live</primary>
Modified: branches/BOOK-elogind/multimedia/libdriv/pulseaudio.xml
==============================================================================
--- branches/BOOK-elogind/multimedia/libdriv/pulseaudio.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/multimedia/libdriv/pulseaudio.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -176,14 +176,15 @@
<sect2 role="commands">
<title>Command Explanations</title>
-
+ <!--
<para>
<command>AUTOPOINT='intltoolize ...</command>:
- <command>autoreconf</command> needs ot be run after applying the
+ <command>autoreconf</command> needs to be run after applying the
patch. Running <command>intltoolize</command> instead of
<command>autopoint</command> prevents an error when running
<command>configure</command> afterwards.
</para>
+ -->
<para>
<parameter>--disable-bluez4</parameter>: This switch disables
Modified: branches/BOOK-elogind/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- branches/BOOK-elogind/multimedia/videoutils/ffmpeg.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/multimedia/videoutils/ffmpeg.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -6,9 +6,9 @@
<!ENTITY ffmpeg-download-http
"http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz";>
<!ENTITY ffmpeg-download-ftp " ">
- <!ENTITY ffmpeg-md5sum "ae0bfdf809306a212b4f0e6eb8d1c75e">
- <!ENTITY ffmpeg-size "8.3 MB">
- <!ENTITY ffmpeg-buildsize "154 MB (add 3.1 GB for the FATE suite/tests,
add 17 MB for docs)">
+ <!ENTITY ffmpeg-md5sum "b011c94e075c2d0cd7c914730f55f9a9">
+ <!ENTITY ffmpeg-size "8.5 MB">
+ <!ENTITY ffmpeg-buildsize "160 MB (add 3.1 GB for the FATE suite/tests,
add 17 MB for docs)">
<!ENTITY ffmpeg-time "1.8 SBU (using parallelism=4; add 3.8 SBU
(with THREADS=4) to run the FATE suite after sample files are downloaded; add
0.4 SBU for docs)">
]>
Modified: branches/BOOK-elogind/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- branches/BOOK-elogind/networking/netprogs/wpa_supplicant.xml Fri Dec
21 20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/networking/netprogs/wpa_supplicant.xml Sat Dec
22 10:19:04 2018 (r20853)
@@ -7,10 +7,10 @@
<!ENTITY wpa_supplicant-download-http
"https://w1.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz";>
<!ENTITY wpa_supplicant-download-ftp " ">
- <!ENTITY wpa_supplicant-md5sum "091569eb4440b7d7f2b4276dbfc03c3c">
- <!ENTITY wpa_supplicant-size "2.6 MB">
+ <!ENTITY wpa_supplicant-md5sum "a68538fb62766f40f890125026c42c10">
+ <!ENTITY wpa_supplicant-size "3.0 MB">
<!ENTITY wpa_supplicant-buildsize "36 MB">
- <!ENTITY wpa_supplicant-time "0.4 SBU (includes optional gui)">
+ <!ENTITY wpa_supplicant-time "0.2 SBU (without optional gui)">
]>
<sect1 id="wpa_supplicant" xreflabel="wpa_supplicant-&wpa_supplicant-version;">
@@ -75,7 +75,7 @@
</para>
</listitem>
</itemizedlist>
-
+<!--
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@@ -85,7 +85,7 @@
</para>
</listitem>
</itemizedlist>
-
+-->
<bridgehead renderas="sect3">WPA Supplicant Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
@@ -194,8 +194,7 @@
following commands:
</para>
-<screen><userinput>patch -p1 -i
../wpa_supplicant-&wpa_supplicant-version;-upstream_fixes-2.patch &&
-cd wpa_supplicant &&
+<screen><userinput>cd wpa_supplicant &&
make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
<para>
Modified: branches/BOOK-elogind/packages.ent
==============================================================================
--- branches/BOOK-elogind/packages.ent Fri Dec 21 20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/packages.ent Sat Dec 22 10:19:04 2018 (r20853)
@@ -79,7 +79,7 @@
<!ENTITY zsh-version "5.6.2">
<!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version "3.0.0">
+<!ENTITY qemu-version "3.1.0">
<!-- Part III -->
<!-- Chapter 9 -->
@@ -127,7 +127,7 @@
<!ENTITY keyutils-version "1.6">
<!ENTITY libaio-version "0.3.111">
<!ENTITY libarchive-version "3.3.3">
-<!ENTITY libassuan-version "2.5.1">
+<!ENTITY libassuan-version "2.5.2">
<!ENTITY libatasmart-version "0.19">
<!ENTITY libatomic_ops-version "7.6.8">
<!ENTITY libblockdev-version "2.20">
@@ -244,7 +244,7 @@
<!ENTITY hd2u-version "1.0.4">
<!ENTITY hicolor-icon-theme-version "0.17">
<!ENTITY icon-naming-utils-version "0.8.90">
-<!ENTITY highlight-version "3.47">
+<!ENTITY highlight-version "3.48">
<!ENTITY ibus-version "1.5.19">
<!ENTITY imagemagick6-version "6.9.10">
<!ENTITY imagemagick-version "7.0.8">
@@ -329,7 +329,7 @@
<!ENTITY git-version "2.20.0">
<!ENTITY guile-version "2.2.4">
<!ENTITY librep-version "0.92.7">
-<!ENTITY llvm-version "7.0.0">
+<!ENTITY llvm-version "7.0.1">
<!ENTITY llvm-old-version "3.9.1">
<!ENTITY lua-version "5.3.5">
<!ENTITY mercurial-version "4.8.1">
@@ -557,7 +557,7 @@
<!ENTITY samba-version "4.9.1">
<!ENTITY wget-version "1.20">
<!ENTITY wireless-tools-version "29">
-<!ENTITY wpa_supplicant-version "2.6">
+<!ENTITY wpa_supplicant-version "2.7">
<!-- Chapter 16 -->
<!ENTITY avahi-version "0.7">
@@ -866,7 +866,7 @@
<!ENTITY feh-version "3.1.1">
<!--<!ENTITY fontforge-date "2015-02-28">-->
<!ENTITY fontforge-version "20170731">
-<!ENTITY gparted-version "0.32.0">
+<!ENTITY gparted-version "0.33.0">
<!ENTITY gimp-version "2.10.8">
<!ENTITY hexchat-version "2.14.2">
<!ENTITY icedtea-web-version "1.7.1">
@@ -964,7 +964,7 @@
<!ENTITY pnmixer-version "0.7.2">
<!-- Chapter 48 -->
-<!ENTITY ffmpeg-version "4.0.2">
+<!ENTITY ffmpeg-version "4.1">
<!ENTITY mplayer-version "1.3.0">
<!ENTITY xine-ui-version "0.99.10">
<!ENTITY transcode-version "1.1.7">
Modified: branches/BOOK-elogind/postlfs/virtualization/qemu.xml
==============================================================================
--- branches/BOOK-elogind/postlfs/virtualization/qemu.xml Fri Dec 21
20:15:14 2018 (r20852)
+++ branches/BOOK-elogind/postlfs/virtualization/qemu.xml Sat Dec 22
10:19:04 2018 (r20853)
@@ -6,10 +6,10 @@
<!ENTITY qemu-download-http
"http://download.qemu-project.org/qemu-&qemu-version;.tar.xz";>
<!ENTITY qemu-download-ftp " ">
- <!ENTITY qemu-md5sum "6a5c8df583406ea24ef25b239c3243e0">
+ <!ENTITY qemu-md5sum "fb687ce0b02d3bf4327e36d3b99427a8">
<!ENTITY qemu-size "34 MB">
- <!ENTITY qemu-buildsize "511 MB (add 383 MB for tests)">
- <!ENTITY qemu-time "0.8 SBU (using parallelism=4; add 2.0 SBU for
tests)">
+ <!ENTITY qemu-buildsize "526 MB (add 414 MB for tests)">
+ <!ENTITY qemu-time "0.8 SBU (using parallelism=4; add 1.9 SBU for
tests)">
]>
<sect1 id="qemu" xreflabel="qemu-&qemu-version;">
Modified: branches/BOOK-elogind/pst/printing/cups-filters.xml
==============================================================================
--- branches/BOOK-elogind/pst/printing/cups-filters.xml Fri Dec 21 20:15:14
2018 (r20852)
+++ branches/BOOK-elogind/pst/printing/cups-filters.xml Sat Dec 22 10:19:04
2018 (r20853)
@@ -177,10 +177,11 @@
<sect2 role="commands">
<title>Command Explanations</title>
<!-- please comment this if no patches are currently needed -->
- <para>
+<!--<para>
<parameter>patch -Np1 -i
../cups-filters-&cups-filters-version;-poppler71-1.patch</parameter>:
Conditionally apply changes for recent versions of poppler.
- </para>
+ </para>
+ Poppler-0.72.0, cups-filters-1.21.5 - no longer needed.-->
<para>
<parameter>--disable-avahi</parameter>: This switch is needed
if the optional <xref linkend="avahi"/> is not installed. Remove
Modified: branches/BOOK-elogind/x/installing/libinput.xml
==============================================================================
--- branches/BOOK-elogind/x/installing/libinput.xml Fri Dec 21 20:15:14
2018 (r20852)
+++ branches/BOOK-elogind/x/installing/libinput.xml Sat Dec 22 10:19:04
2018 (r20853)
@@ -179,14 +179,16 @@
<screen role="root"><userinput>ninja install</userinput></screen>
<para>
- If <xref linkend="doxygen"/> and <xref linkend="graphviz"/> were
+ If <xref linkend="doxygen"/>, <xref linkend="graphviz"/>, and
+ <ulink url="http://sphinx-doc.org/";>Sphinx</ulink> were
present during the build, you can install the generated documentation
by running the following commands as the <systemitem
class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>install -v -dm755
/usr/share/doc/libinput-&libinput-version; &&
-cp -rv html/*
/usr/share/doc/libinput-&libinput-version;</userinput></screen>
+<screen role="root"><userinput>install -v -dm755
/usr/share/doc/libinput-&libinput-version;/{html,api} &&
+cp -rv Documentation/* /usr/share/doc/libinput-&libinput-version;/html
&&
+cp -rv api/*
/usr/share/doc/libinput-&libinput-version;/api</userinput></screen>
</sect3>
Modified: branches/BOOK-elogind/x/wm/openbox.xml
==============================================================================
--- branches/BOOK-elogind/x/wm/openbox.xml Fri Dec 21 20:15:14 2018
(r20852)
+++ branches/BOOK-elogind/x/wm/openbox.xml Sat Dec 22 10:19:04 2018
(r20853)
@@ -78,6 +78,8 @@
<para role="optional">
<xref role="runtime" linkend="dbus"/> (runtime),
<xref linkend="imlib2"/> (to enable icons in the right click menu),
+ <xref linkend="imagemagick"/> (to show desktop backgrounds as seen in the
+ Configuration Information section below),
<xref linkend="pyxdg"/>,
<xref linkend="startup-notification"/>, and
<xref linkend="librsvg"/>
Modified: branches/BOOK-elogind/xsoft/other/gimp.xml
==============================================================================
--- branches/BOOK-elogind/xsoft/other/gimp.xml Fri Dec 21 20:15:14 2018
(r20852)
+++ branches/BOOK-elogind/xsoft/other/gimp.xml Sat Dec 22 10:19:04 2018
(r20853)
@@ -113,6 +113,8 @@
<para>
Download size: &gimp-help-size;
</para>
+ </listitem>
+ <listitem>
<para>
Download md5sum: &gimp-help-md5sum;
</para>
Modified: branches/BOOK-elogind/xsoft/other/gparted.xml
==============================================================================
--- branches/BOOK-elogind/xsoft/other/gparted.xml Fri Dec 21 20:15:14
2018 (r20852)
+++ branches/BOOK-elogind/xsoft/other/gparted.xml Sat Dec 22 10:19:04
2018 (r20853)
@@ -6,9 +6,9 @@
<!ENTITY gparted-download-http
"&sourceforge-dl;/gparted/gparted-&gparted-version;.tar.gz">
<!ENTITY gparted-download-ftp " ">
- <!ENTITY gparted-md5sum "df4fe0350ba55cee6fddae289bd9d3f1">
+ <!ENTITY gparted-md5sum "2f481ad34decb7021ca04ca305e79e7d">
<!ENTITY gparted-size "3.7 MB">
- <!ENTITY gparted-buildsize "108 MB">
+ <!ENTITY gparted-buildsize "109 MB">
<!ENTITY gparted-time "0.4 SBU (using parallelism=4)">
]>
Modified: branches/BOOK-elogind/xsoft/other/inkscape.xml
==============================================================================
--- branches/BOOK-elogind/xsoft/other/inkscape.xml Fri Dec 21 20:15:14
2018 (r20852)
+++ branches/BOOK-elogind/xsoft/other/inkscape.xml Sat Dec 22 10:19:04
2018 (r20853)
@@ -72,11 +72,15 @@
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
+ <!--
<listitem>
<para>Required patch: <ulink
url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/></para>
</listitem>
<listitem>
<para>Required patch: <ulink
url="&patch-root;/inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch"/></para>
+ </listitem>-->
+ <listitem>
+ <para>Required patch: <ulink
url="&patch-root;/inkscape-&inkscape-version;-consolidated_fixes-1.patch"/></para>
</listitem>
</itemizedlist>
@@ -143,15 +147,19 @@
<sect2 role="installation">
<title>Installation of Inkscape</title>
-
+ <!--
<para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be
used,
and fix the build for the changes in some recent versions of
<application>poppler</application>:</para>
-
+ -->
+ <para>Fix build problems related to poppler-0.72.0 and allow proper
detection
+ of libraries from <xref linkend="imagemagick6"/>:</para>
+<screen><userinput>patch -Np1 -i
../inkscape-&inkscape-version;-consolidated_fixes-1.patch</userinput></screen>
+<!--
<screen><userinput>patch -Np1 -i
../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &&
patch -Np1 -i ../inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch
</userinput></screen>
-
+-->
<para>
Fix build issues with <application>GCC-7.1</application> and
<application>poppler-0.71.0</application>:
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
