Changeset d113301


Ignore:
Timestamp:
01/09/2017 07:49:42 PM (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.0, 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:
71e28a7f
Parents:
02b153a
Message:

Attempt to add the ImageMagick-6 page - I did not notice that my attempt a couple of hours ago ended in error.

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

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • general/genutils/genutils.xml

    r02b153a rd113301  
    3737  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
    3838
    39 <!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick6.xml"/> -->
     39  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick6.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
    4141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>

  • introduction/welcome/changelog.xml

    r02b153a rd113301  
    4343    </listitem>
    4444-->
     45
    4546    <listitem>
    4647      <para>January 9th, 2017</para>
    4748      <itemizedlist>
     49        <listitem>
     50          <para>[ken] - Commit the new page for ImageMagick-6.</para>
     51        </listitem>
    4852        <listitem>
    4953          <para>[bdubbs] - Update to nss-3.28.1. Fixes

  • postlfs/editors/emacs.xml

    r02b153a rd113301  
    7272      <xref linkend="gpm"/>,
    7373      <xref linkend="gtk2"/> or <xref linkend="gtk3"/>,
    74 <!--       <xref linkend="imagemagick6"/> (see command explanations), Ken, please commit file. -->
     74      <xref linkend="imagemagick6"/> (see command explanations),
    7575      <xref linkend="libjpeg"/>,
    7676      <xref linkend="libpng"/>,
    … …  
    153153    of <filename class='directory'>/usr/var/games/emacs</filename>.</para>
    154154
    155 <!--
    156155    <para><option>IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6
    157156    IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI
    … …  
    161160    pkgconfig files collide with <xref linkend="imagemagick"/> which this
    162161    package cannot use).</para>
    163 Comment out until imagemagick6 file is committed.
    164 -->
     162
    165163  </sect2>
    166164

  • xsoft/other/inkscape.xml

    r02b153a rd113301  
    100100    <bridgehead renderas="sect4">Recommended</bridgehead>
    101101    <para role="recommended">
    102 <!--       <xref linkend="imagemagick6"/>, Comment out until file gets committed -->
    103 <!-- Ken, please commit. -->
     102      <xref linkend="imagemagick6"/>,
    104103      <xref linkend="lcms2"/> or
    105104      <xref linkend="lcms"/>
Note: See TracChangeset for help on using the changeset viewer.