Changeset 45b31bb for kde


Ignore:
Timestamp:
01/04/2021 12:29:20 PM (9 months ago)
Author:
Pierre Labastie <pieere@…>
Branches:
qt5new
Children:
c9426454
Parents:
3fa3e246 (diff), d67acd4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging trunk r24052 through r24067

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/qt5new@24068 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
kde
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kde/extra-cmake-modules.xml

    r3fa3e246 r45b31bb  
    8181    <bridgehead renderas="sect4">Optional</bridgehead>
    8282    <para role="optional">
     83      <ulink url="https://pypi.org/project/PyQt5/">PyQt</ulink> (experimental
     84      support for building KDE Python bindings), and
    8385      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for
    8486         building documentation)
  • kde/kf5/kf5-frameworks.xml

    r3fa3e246 r45b31bb  
    8686    <xref linkend="libepoxy"/>,
    8787    <xref linkend="libgcrypt"/>,
     88    <xref linkend="libical"/>,
    8889    <xref linkend="libjpeg"/>,
    8990    <xref linkend="libpng"/>,
     
    115116  <para role="optional">
    116117    <xref linkend="bluez"/> (needed to build Bluez-Qt),
    117     <xref linkend="ModemManager"/> (needed to build ModemManager-Qt)
     118    <xref linkend="ModemManager"/> (needed to build ModemManager-Qt),
     119    <ulink url="http://libdmtx.sourceforge.net/">Datamatrix</ulink> (deemed
     120      recommended for Prison by upstream)
    118121  </para>
    119122
     
    158161    <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink> and
    159162    <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
    160   </para>
    161 
    162   <bridgehead renderas="sect4">Recommended dependency for Prison</bridgehead>
    163   <para role="optional">
    164     <!-- Leaving as optional since this is external -->
    165     <ulink url="http://libdmtx.sourceforge.net/">Datamatrix</ulink> and
    166163  </para>
    167164
Note: See TracChangeset for help on using the changeset viewer.