Ignore:
Timestamp:
11/29/2023 08:46:34 AM (7 months ago)
Author:
Ken Moffat <ken@…>
Branches:
12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, trunk, xry111/llvm18
Children:
9c1319c
Parents:
f57d8fc (diff), 1b9bf3e (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:

Merge branch 'trunk' into ken/tuningfonts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gnome/platform/evolution-data-server.xml

    rf57d8fc r3a579120  
    102102    <bridgehead renderas="sect4">Optional</bridgehead>
    103103    <para role="optional">
    104       <xref linkend="db"/>,
    105104      <xref linkend="gtk-doc"/>,
    106105      <xref linkend="mitkrb"/>,
    107106      a <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
    108       <xref linkend="openldap"/>, and
     107      <xref linkend="openldap"/>,
     108      &berkeley-db;, and
    109109      <ulink url="https://github.com/googlei18n/libphonenumber/">libphonenumber</ulink>
    110110    </para>
     
    114114  <sect2 role="installation">
    115115    <title>Installation of Evolution Data Server</title>
     116
     117    <para>
     118      First, fix a build failure when using libxml2-2.12.x:
     119    </para>
     120
     121<screen><userinput remap="pre">sed -i '/xpathInternals.h/a #include &lt;libxml/globals.h&gt;' src/libedataserver/e-xml-utils.c</userinput></screen>
    116122
    117123    <para>
     
    185191    <para>
    186192      <parameter>-DWITH_LIBDB=OFF</parameter>: This switch allows building
    187       this package without <xref linkend="db"/>.  This package only uses
    188       <xref linkend="db"/> to import data from very outdated releases.
     193      this package without &berkeley-db;.  <!--This package only uses
     194      &berkeley-db; to import data from very outdated releases.-->
    189195      <xref linkend="sqlite"/> is used for normal operation.
    190196    </para>
Note: See TracChangeset for help on using the changeset viewer.