Changeset 69b2349


Ignore:
Timestamp:
06/08/2016 02:30:12 AM (8 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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, nosym, 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:
08f422e
Parents:
1552ac8
Message:

Update graphviz to build with Qt5
Archive qjson

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

Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general/genlib/genlib.xml

    r1552ac8 r69b2349  
    124124  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/>
    125125  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
    126   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>
     126  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>-->
    127127  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
    128128  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>

  • general/genutils/graphviz.xml

    r1552ac8 r69b2349  
    4040    </para>
    4141
    42     &lfs79_checked;
     42    &lfs79_checked;&gcc6_checked;
    4343
    4444    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7676    </itemizedlist>
    7777
     78    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     79    <itemizedlist spacing="compact">
     80      <listitem>
     81        <para>
     82          Required patch:
     83          <ulink url="&patch-root;/graphviz-&graphviz-version;-consolidated_fixes-1.patch"/>
     84        </para>
     85      </listitem>
     86    </itemizedlist>
     87
    7888    <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
    7989
    … …  
    93103    <bridgehead renderas="sect4">Optional</bridgehead>
    94104    <para role="optional">
     105      <xref linkend="libglade"/>,
     106      <xref linkend="gs"/>,
     107      <xref linkend="gtk2"/>,
     108      <xref linkend="qt5"/>,
    95109      <ulink url="http://openil.sourceforge.net/projects.php">DevIL</ulink>,
    96110      <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
    97       <xref linkend="libglade"/>,
    98111      <ulink url="http://sourceforge.net/projects/lasi/">libLASi</ulink>,
    99       <ulink url="http://www.libgd.org/">GD Library</ulink>,
    100       <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>,
    101       <xref linkend="gs"/>,
    102       <xref linkend="gtk2"/> and
    103       <xref linkend="qt4"/>
     112      <ulink url="http://www.libgd.org/">GD Library</ulink>, and
     113      <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>
    104114    </para>
    105115
    … …  
    110120      <xref linkend="guile"/>,
    111121      <xref linkend="openjdk"/>,
    112       <ulink url="http://iolanguage.org/">Io</ulink>,
    113122      <xref linkend="lua"/>,
    114       <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
    115       <ulink url="http://ocaml.org/">OCaml</ulink>,
    116123      <xref linkend="php"/>,
    117124      <xref linkend="python2"/>,
    118       <ulink url="http://www.r-project.org/">R</ulink>,
    119125      <xref linkend="ruby"/>,
    120       <xref linkend="tcl"/> and
    121       <xref linkend="tk"/>
     126      <xref linkend="tcl"/>,
     127      <xref linkend="tk"/>,
     128      <ulink url="http://iolanguage.org/">Io</ulink>,
     129      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
     130      <ulink url="http://ocaml.org/">OCaml</ulink>, and
     131      <ulink url="http://www.r-project.org/">R</ulink>
    122132    </para>
    123133
    … …  
    135145    </para>
    136146
    137 <screen><userinput>sed -i 's/ruby-1.9/ruby-2.2/g' configure                  &amp;&amp;
    138 sed -i 's/ e_/ gs_error_/'     plugin/gs/gvloadimage_gs.c &amp;&amp;
    139 
    140 ./configure --prefix=/usr         &amp;&amp;
     147<screen><userinput>patch -Np1 -i ../graphviz-&graphviz-version;-consolidated_fixes-1.patch &amp;&amp;
     148autoreconf                               &amp;&amp;
     149./configure --prefix=/usr --disable-php  &amp;&amp;
    141150make</userinput></screen>
    142151
    … …  
    169178
    170179    <para>
    171       <command>sed -e "s:ruby-1.9:ruby-2.2:g" -i configure</command>:
    172       Use this command, if ruby-2.2.0 is installed and you wish
    173       <application>Graphviz</application> built with support for it.
    174     </para>
    175 
    176     <para>
    177       <command>sed -e 's/ e_/ gs_error_/' ...</command>: Use this
    178       command, if ghostscript-9.18 or later is installed and you wish
    179       <application>Graphviz</application> built with support for it, or
    180       else the build fails because some identifiers have been renamed in
    181       ghostscript-9.18's headers.
     180      <option>--disable-php</option>: Theis version of graphviz
     181      does not supoprt php version 7.
    182182    </para>
    183183

  • introduction/welcome/changelog.xml

    r1552ac8 r69b2349  
    4747      <para>June 7th, 2016</para>
    4848      <itemizedlist>
     49        <listitem>
     50          <para>[bdubbs] - Update graphviz to build with Qt5.</para>
     51        </listitem>
    4952        <listitem>
    5053          <para>[bdubbs] - Remove reference to qt4 in avahi

  • kde/libdbusmenuqt.xml

    r1552ac8 r69b2349  
    6161    <bridgehead renderas="sect4">Required</bridgehead>
    6262    <para role="required">
    63     <!--<xref linkend="qt4"/> or --><xref linkend="qt5"/>
     63      <xref linkend="qt5"/>
    6464    </para>
    6565
    6666    <bridgehead renderas="sect4">Optional</bridgehead>
    6767    <para role="optional">
    68     <xref linkend="qjson"/> (for building the test suite) and
    69     <xref linkend="doxygen"/> (for building the API documentation)
     68      <xref linkend="doxygen"/> (for building the API documentation)
    7069    </para>
    7170
    … …  
    7776  <sect2 role="installation">
    7877    <title>Installation of libdbusmenu-qt</title>
    79 <!--
    80     <para>Install the qt4 based version of
    81     <application>libdbusmenu-qt</application> by running the following
    82     commands:</para>
    8378
    84 <screen><userinput>mkdir build &amp;&amp;
    85 cd    build &amp;&amp;
     79    <para>Install <application>libdbusmenu-qt</application> by running the
     80    following commands:</para>
    8681
    87 cmake -DCMAKE_INSTALL_PREFIX=/usr \
    88       -DCMAKE_BUILD_TYPE=Release  \
    89       -DUSE_QT4=TRUE              \
    90       -DWITH_DOC=OFF              \
    91       -Wno-dev .. &amp;&amp;
    92 make</userinput></screen>
    93 
    94     <para>To test the results
    95     (<xref linkend="qjson"/> must be installed),
    96     issue: <command>make -k check</command>. One test is known to fail.</para>
    97 
    98     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    99 
    100 <screen role="root"><userinput>make install</userinput></screen>
    101 -->
    102     <para>Install <!--the qt5 based version of-->
    103     <application>libdbusmenu-qt</application> by running the following
    104     commands:</para>
    105 <!--
    106     <note><para>If building both versions of this application, be sure
    107     to remove the previous version of the source and reextract them from
    108     the original tar file.</para></note>
    109 -->
    11082<screen><userinput>mkdir build &amp;&amp;
    11183cd    build &amp;&amp;
    … …  
    11789make</userinput></screen>
    11890
     91    <!--
    11992    <para>
    12093      To test the results (<xref linkend="qjson"/> must be installed),
    12194      issue: <command>make -k check</command>. One test is known to fail.
    12295    </para>
     96    -->
     97
     98    <para>This packages doe not come wiht a working test suite.</para>
    12399
    124100    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Note: See TracChangeset for help on using the changeset viewer.