Author: bdubbs
Date: Fri Jan 18 12:36:19 2019
New Revision: 20993
Log:
Update to inkscape-0.92.4.
Upstream seems to have finally gotten this right. No more poppler issues.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/xsoft/other/inkscape.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Fri Jan 18 10:28:07 2019 (r20992)
+++ trunk/BOOK/general.ent Fri Jan 18 12:36:19 2019 (r20993)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "17"> <!-- Always 2 digits -->
+<!ENTITY day "18"> <!-- Always 2 digits -->
<!ENTITY month "01"> <!-- Always 2 digits -->
<!ENTITY year "2019">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "January 17th, &year;">
+<!ENTITY releasedate "January 18th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Jan 18 10:28:07
2019 (r20992)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Jan 18 12:36:19
2019 (r20993)
@@ -42,6 +42,16 @@
</listitem>
-->
<listitem>
+ <para>January 18th, 2019</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbbs] - Update to inkscape-0.92.4. Fixes
+ <ulink url="&blfs-ticket-root;11558">#11558</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 17th, 2019</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Fri Jan 18 10:28:07 2019 (r20992)
+++ trunk/BOOK/packages.ent Fri Jan 18 12:36:19 2019 (r20993)
@@ -869,7 +869,7 @@
<!ENTITY hexchat-version "2.14.2">
<!ENTITY icedtea-web-version "1.7.1">
<!ENTITY inkscape-minor-version "0.92">
-<!ENTITY inkscape-version "&inkscape-minor-version;.3">
+<!ENTITY inkscape-version "&inkscape-minor-version;.4">
<!ENTITY pan-version "0.133">
<!ENTITY pidgin-version "2.13.0">
<!ENTITY rox-filer-version "2.11">
Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Fri Jan 18 10:28:07 2019 (r20992)
+++ trunk/BOOK/xsoft/other/inkscape.xml Fri Jan 18 12:36:19 2019 (r20993)
@@ -5,10 +5,10 @@
%general-entities;
<!ENTITY inkscape-download-http
"https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2";>
<!ENTITY inkscape-download-ftp " ">
- <!ENTITY inkscape-md5sum "4ef7171cc1de9e1608d8c49b77fed99e">
- <!ENTITY inkscape-size "31 MB">
- <!ENTITY inkscape-buildsize "395 MB (add 8 MB for tests)">
- <!ENTITY inkscape-time "4.9 SBU (add 0.2 SBU for tests, both with
parallelism=4)">
+ <!ENTITY inkscape-md5sum "ac30f6d5747fd9c620c00dad500f414f">
+ <!ENTITY inkscape-size "30 MB">
+ <!ENTITY inkscape-buildsize "399 MB (add 135 MB for tests)">
+ <!ENTITY inkscape-time "4.5 SBU (add 0.2 SBU for tests, both with
parallelism=4)">
]>
<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-version;">
@@ -72,16 +72,9 @@
<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-2.patch"/></para>
- </listitem>
</itemizedlist>
<bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
@@ -147,27 +140,12 @@
<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.73.0 and allow proper
detection
- of libraries from <xref linkend="imagemagick6"/>:</para>
-<screen><userinput>patch -Np1 -i
../inkscape-&inkscape-version;-consolidated_fixes-2.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>:
+ Ensure that the libraries from <xref linkend="imagemagick6"/> can be
used:
</para>
-<screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
&&
-sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
- -i src/extension/internal/pdfinput/pdf-parser.*</userinput></screen>
+<screen><userinput>patch -Np1 -i
../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
<!-- If there is no test suite, then this is not needed.
There is none if the command below is not run. -->
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
