Changeset 7d35ee59


Ignore:
Timestamp:
08/14/2017 02:06:29 AM (7 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
9f18cc0
Parents:
c1add1f5
Message:

Inkscape-0.92.2, use cmake, add the deps which upstream recommend for it.

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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • general/graphlib/graphlib.xml

    rc1add1f5 r7d35ee59  
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
    5050  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
     51  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="potrace.xml"/>
    5152  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
    5253

  • general/prog/lxml.xml

    rc1add1f5 r7d35ee59  
    1515
    1616  <!-- Begin lxml -->
    17   <sect2 id="lxml" xreflabel="lxml-&lxml-version;" revision="systemd">
     17  <sect2 id="lxml" xreflabel="lxml-&lxml-version;">
    1818
    1919    <title>lxml-&lxml-version;</title>

  • general/prog/python-modules.xml

    rc1add1f5 r7d35ee59  
    9696        </para>
    9797      </listitem>
    98       <listitem revision="systemd">
     98      <listitem>
    9999        <para>
    100100          <xref linkend="lxml"/>
    … …  
    114114        <para>
    115115          <xref linkend="Mako"/>
     116        </para>
     117      </listitem>
     118      <listitem>
     119        <para>
     120          <xref linkend="scour"/>
    116121        </para>
    117122      </listitem>
    … …  
    177182    href="pyyaml.xml"/>
    178183
     184  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     185    href="scour.xml"/>
     186
    179187</sect1>

  • introduction/welcome/changelog.xml

    rc1add1f5 r7d35ee59  
    4646      <para>August 13th, 2017</para>
    4747      <itemizedlist>
     48        <listitem>
     49          <para>[ken] - Update to inkscape-0.92.2 and add recommended
     50          deps <phrase revision="sysv">lxml (Python module), </phrase>
     51          Scour (Python module) and Potrace. Fixes
     52          <ulink url="&blfs-ticket-root;9590">#9590</ulink>.</para>
     53        </listitem>
    4854        <listitem>
    4955          <para>[bdubbs] - Update to cups-filters-1.16.1. Fixes

  • packages.ent

    rc1add1f5 r7d35ee59  
    213213<!ENTITY pixman-version               "0.34.0">   <!-- Even minors only -->
    214214<!ENTITY poppler-version              "0.57.0">
     215<!ENTITY potrace-version              "1.15">
    215216<!ENTITY qpdf-version                 "6.0.0">
    216217
    … …  
    396397<!ENTITY Jinja2-version               "2.9.6">
    397398<!ENTITY lxml-version                 "3.8.0">
     399<!ENTITY mako-version                 "1.0.4">
    398400<!ENTITY MarkupSafe-version           "1.0">
    399401<!ENTITY pyatspi2-version             "2.24.0">
    … …  
    406408<!ENTITY pyxdg-version                "0.25">
    407409<!ENTITY PyYAML-version               "3.12">
     410<!ENTITY scour-version                "0.36">
    408411<!-- <!ENTITY setuptools-version           "30.2.0"> -->
    409 <!ENTITY mako-version                 "1.0.4">
    410412
    411413<!-- Part IV -->
    … …  
    726728<!ENTITY icedtea-web-version          "1.7">
    727729<!ENTITY inkscape-minor-version       "0.92">
    728 <!ENTITY inkscape-version             "&inkscape-minor-version;.1">
     730<!ENTITY inkscape-version             "&inkscape-minor-version;.2">
    729731<!ENTITY pan-version                  "0.133">
    730732<!ENTITY pidgin-version               "2.12.0">

  • xsoft/other/inkscape.xml

    rc1add1f5 r7d35ee59  
    44  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    6 <!-- Use when point version is not 0 -->
    7   <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/&inkscape-minor-version;.x/&inkscape-version;/+download/inkscape-&inkscape-version;.tar.bz2">
    8 <!-- Use when point version is 0
    9   <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/&inkscape-minor-version;.x/&inkscape-minor-version;/+download/inkscape-&inkscape-version;.tar.bz2"> -->
     6  <!ENTITY inkscape-download-http "https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2">
    107  <!ENTITY inkscape-download-ftp  " ">
    11   <!ENTITY inkscape-md5sum        "db2eb2a566cf35ff949fc9ccb172889a">
     8  <!ENTITY inkscape-md5sum        "6f6bcbd0237ecd064460315465467b04">
    129  <!ENTITY inkscape-size          "30 MB">
    13   <!ENTITY inkscape-buildsize     "1.3 GB (add 39 MB for tests)">
    14   <!ENTITY inkscape-time          "18 SBU (add 0.8 SBU for tests)">
     10  <!ENTITY inkscape-buildsize     "526 MB (add 8 MB for tests)">
     11  <!ENTITY inkscape-time          "4.9 SBU (add 0.2 SBU for tests, both with parallelism=4)">
    1512]>
    1613
    … …  
    3936
    4037    &lfs80_checked;
     38    &gcc7_checked;
    4139
    4240    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7169          Estimated build time: &inkscape-time;
    7270        </para>
     71      </listitem>
     72    </itemizedlist>
     73
     74    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     75    <itemizedlist spacing="compact">
     76      <listitem>
     77        <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/></para>
    7378      </listitem>
    7479    </itemizedlist>
    … …  
    8590      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gdl/">gnome docking library</ulink>
    8691      for the experimental gtk+-3 build),
    87       <xref linkend="libxslt"/> and
    88       <xref linkend="popt"/>
     92      <xref linkend="libxslt"/>,
     93      <xref linkend="popt"/> and
     94      <xref linkend="wget"/> (to download the test dependencies)
    8995    </para>
    9096
    … …  
    9399      <xref linkend="imagemagick6"/>,
    94100      <xref linkend="lcms2"/> or
    95       <xref linkend="lcms"/>
     101      <xref linkend="lcms"/>,
     102      <xref linkend="potrace"/> (for the bucket-fill tool),
     103      <xref linkend="lxml"/> and
     104      <xref linkend="scour"/> (both at runtime, for Save As Optimized SVG).
    96105    </para>
    97106
    … …  
    99108    <para role="optional">
    100109      <xref linkend="aspell"/>,
    101       <xref linkend="dbus"/>,
     110      <xref linkend="dbus"/> (to run inkscape from scripts),
    102111      <xref linkend="doxygen"/>,
    103112      <xref linkend="poppler"/>,
    … …  
    107116      them here I get "There is currently no text in this page...". Ken or
    108117      developer: wiki.documentfoundation.org pages don't like trailing / -->
    109 
    110118      <!--<ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
    111119      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,-->
    112120      <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
    113121      <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
    114       <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
     122      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink> (or
     123      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>) and
    115124      <ulink url="https://sourceforge.net/projects/NumPy/files/">NumPy</ulink>
    116       (for the testsuite and at runtime for some extensions) and
    117       <phrase revision="sysv"><ulink url="http://cheeseshop.python.org/pypi/lxml/">python-lxml</ulink></phrase>
    118       <phrase revision="systemd"><xref linkend="lxml"/></phrase>
    119       (for the testsuite, and at runtime for some of the extensions)
     125      (at runtime for some extensions)
    120126    </para>
    121127
    … …  
    134140    <title>Installation of Inkscape</title>
    135141
     142    <para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be used:</para>
     143
     144<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
     145
    136146    <para>
    137147      Fix a build issue with <application>GCC-7.1</application>:
    … …  
    139149
    140150<screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp</userinput></screen>
     151
     152    <para>
     153      If you wish to run the testsuite, download the required versions of
     154      <application>googletest</application> and
     155      <application>googlemock</application> by running:
     156    </para>
     157
     158<screen><userinput>bash download-gtest.sh</userinput></screen>
    141159
    142160    <para>
    … …  
    145163    </para>
    146164
    147 <screen><userinput>./autogen.sh &amp;&amp;
    148 
    149 IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 \
    150 IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" \
    151 ./configure --prefix=/usr &amp;&amp;
     165<screen><userinput>
     166mkdir build &amp;&amp;
     167cd build    &amp;&amp;
     168
     169cmake -DCMAKE_INSTALL_PREFIX=/usr \
     170      -DCMAKE_BUILD_TYPE=Release  \
     171      ..                          &amp;&amp;
    152172
    153173make</userinput></screen>
    … …  
    160180    </para>
    161181
    162 <screen role="root"><userinput>make install</userinput></screen>
     182<screen role="root"><userinput>make install                      &amp;&amp;
     183rm -v /usr/lib/inkscape/lib*_LIB.a</userinput></screen>
    163184
    164185    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    171192
    172193    <para>
    173       <command>IMAGE_MAGICK_CFLAGS= ... IMAGE_MAGICK_LIBS= ...</command>:
    174       The configure script looks for ImageMagick-6 using the normal
    175       unversioned pkgconfig file names which are also used by the newer
    176       ImageMAgick-7 - in BLFS we patched it to rename those files, so
    177       these variables will allow <command>configure</command> to find
    178       the things it needs.
     194      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
     195      build the release library without any debug `assert` in the code.
     196    </para>
     197
     198    <para>
     199      <parameter>rm -v /usr/lib/inkscape/lib*_LIB.a</parameter>: The conversion
     200      of the package to use <command>cmake</command> has led to these libraries
     201      getting installed, but they are not usable (there are no header files to
     202      let a program know what they contain). So remove them.
     203    </para>
     204
     205    <para>
     206      <option>-DWITH_DBUS=ON</option>: use this if you wish to use
     207      <command>inkscape</command> in interactive scripts which manipulate
     208      images.
    179209    </para>
    180210
    … …  
    186216    <segmentedlist>
    187217      <segtitle>Installed Programs</segtitle>
    188       <segtitle>Installed Libraries</segtitle>
    189       <segtitle>Installed Directory</segtitle>
     218      <segtitle>Installed Library</segtitle>
     219      <segtitle>Installed Directories</segtitle>
    190220
    191221      <seglistitem>
    … …  
    194224        </seg>
    195225        <seg>
    196           None
     226          libinkscape_base.so
    197227        </seg>
    198228        <seg>
    199           /usr/share/inkscape
     229          /usr/lib/inkscape and /usr/share/inkscape
    200230        </seg>
    201231      </seglistitem>
    … …  
    231261      </varlistentry>
    232262
     263      <varlistentry id="libinkscape_base">
     264        <term><filename class="libraryfile">libinkscape_base.so</filename></term>
     265        <listitem>
     266          <para>
     267            provides the routines used by inkscape and inkview.
     268          </para>
     269          <indexterm zone="inkscape libinkscape_base">
     270            <primary sortas="c-libinkscape_base">libinkscape_base.so</primary>
     271          </indexterm>
     272        </listitem>
     273      </varlistentry>
     274
    233275    </variablelist>
    234276
Note: See TracChangeset for help on using the changeset viewer.