Changeset 3fea4ca


Ignore:
Timestamp:
12/22/2011 07:23:23 PM (10 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
94cebca
Parents:
b5f6f3a
Message:

Update to kdeadmin-3.5.13.
Tweaks in kde core instructions.

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

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    rb5f6f3a r3fea4ca  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[Bdubbs] - Update to kdeadmin-3.5.13.</para>
     49        </listitem>
     50        <listitem>
    4851          <para>[abenton] - Tiff 4.0.0.</para>
    4952        </listitem>
  • kde/add/kdeadmin.xml

    rb5f6f3a r3fea4ca  
    44  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    6   <!ENTITY kdeadmin-download-http "&kde-download-http;/kdeadmin-&kde-version;.tar.bz2">
    7   <!ENTITY kdeadmin-download-ftp  "&kde-download-ftp;/kdeadmin-&kde-version;.tar.bz2">
    8   <!ENTITY kdeadmin-md5sum        "eb23c52c945f31a48f2c9df4330a1262">
    9   <!ENTITY kdeadmin-size          "2.0 MB">
    10   <!ENTITY kdeadmin-buildsize     "26 MB">
    11   <!ENTITY kdeadmin-time          "1.6 SBU">
     6  <!ENTITY kdeadmin-download-http "&trinity-repo-http;/kdeadmin-&trinity-version;.tar.bz2">
     7  <!ENTITY kdeadmin-download-ftp  "&trinity-repo-ftp;/kdeadmin-&trinity-version;.tar.bz2">
     8  <!ENTITY kdeadmin-md5sum        "b8bbabf353070a3e730464e0ce2960e2">
     9  <!ENTITY kdeadmin-size          "1.9 MB">
     10  <!ENTITY kdeadmin-buildsize     "132 MB">
     11  <!ENTITY kdeadmin-time          "1.4 SBU">
    1212]>
    1313
     
    2020  </sect1info>
    2121
    22   <title>Kdeadmin-&kde-version;</title>
     22  <title>Kdeadmin-&trinity-version;</title>
    2323
    2424  <indexterm zone="kdeadmin">
     
    5959
    6060    <bridgehead renderas="sect4">Required</bridgehead>
    61     <para role="required"><xref linkend="kdebase"/></para>
     61    <para role="required">
     62      <xref linkend="kdebase"/>
     63    </para>
    6264
    6365    <bridgehead renderas="sect4">Recommended</bridgehead>
    64     <para role="recommended"><xref linkend="libjpeg"/> and
    65     <xref linkend="libxml2"/></para>
     66    <para role="recommended">
     67      <xref linkend="libjpeg"/> and
     68      <xref linkend="libxml2"/>
     69    </para>
    6670
    6771    <bridgehead renderas="sect4">Optional</bridgehead>
    68     <para role="optional"><xref linkend="linux-pam"/> and
    69     <ulink url="http://lilo.go.dyndns.org/">LILO</ulink></para>
     72    <para role="optional">
     73      <xref linkend="linux-pam"/> and
     74      <ulink url="http://lilo.go.dyndns.org/">LILO</ulink>
     75    </para>
    7076
    7177    <para condition="html" role="usernotes">User Notes:
     
    8894    <para>Install <application>kdeadmin</application> with:</para>
    8995
    90 <screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
    91     --disable-dependency-tracking &amp;&amp;
     96<screen><userinput>
     97cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
     98cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
     99sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@" admin/acinclude.m4.in &amp;&amp;
     100make -f admin/Makefile.common                                 &amp;&amp;
     101
     102./configure --prefix=$TRINITY_PREFIX \
     103            --enable-closure         \
     104            --sysconfdir=/etc        \
     105            --localstatedir=/var     \
     106            --with-extra-libs=$TRINITY_PREFIX/lib &amp;&amp;
     107
    92108make</userinput></screen>
    93109
     
    97113
    98114<screen role="root"><userinput>make install</userinput></screen>
     115
     116  </sect2>
     117
     118  <sect2 role="commands">
     119    <title>Command Explanations</title>
     120
     121    <para><command>cp -v /usr/share/... admin/...</command>:
     122    Ensure the .m4 files are consistent with the current autotools version.</para>
     123
     124    <para><command>sed ... admin/acinclude.m4.in</command>:
     125    Update the paths to the Trinity libraries.</para>
     126
     127    <para><command>make -f admin/Makefile.common</command>: Create the configure
     128    script.</para>
     129
     130    <para><parameter>--with-extra-libs=$TRINITY_PREFIX/lib</parameter>: This
     131    option ensure the Trinity libraries are found in the
     132    <filename>Makefile</filename>s.</para>
    99133
    100134  </sect2>
     
    109143
    110144      <seglistitem>
    111         <seg>kcron, kdat, kpackage, ksysv, and kuser</seg>
    112         <seg>None</seg>
    113         <seg>None</seg>
     145        <seg>kcron, kdat, kpackage, ksysv, kuser, and secpolicy</seg>
     146        <seg>kcm_knetworkconfmodule.so, kfile_deb.so, and kfile_rpm.so</seg>
     147        <seg>$TRINITY_PREFIX/lib/trinity</seg>
    114148      </seglistitem>
    115149    </segmentedlist>
  • kde/core/kdebase.xml

    rb5f6f3a r3fea4ca  
    55  %general-entities;
    66
    7   <!ENTITY kdebase-download-http "&trinity-repo-http;/kdebase-&kde-version;.tar.gz">
    8   <!ENTITY kdebase-download-ftp  "&trinity-repo-ftp;/kdebase-&kde-version;.tar.gz">
     7  <!ENTITY kdebase-download-http "&trinity-repo-http;/kdebase-&trinity-version;.tar.gz">
     8  <!ENTITY kdebase-download-ftp  "&trinity-repo-ftp;/kdebase-&trinity-version;.tar.gz">
    99  <!ENTITY kdebase-md5sum        "d1f7e1f94eeb46b981fe1ba144179840">
    1010  <!ENTITY kdebase-size          "28.3 MB">
     
    1313]>
    1414
    15 <sect1 id="kdebase" xreflabel="kdebase-&kde-version;">
     15<sect1 id="kdebase" xreflabel="kdebase-&trinity-version;">
    1616  <?dbhtml filename="kdebase.html"?>
    1717
     
    2121  </sect1info>
    2222
    23   <title>Kdebase-&kde-version;</title>
     23  <title>Kdebase-&trinity-version;</title>
    2424
    2525  <indexterm zone="kdebase">
  • kde/core/kdelibs.xml

    rb5f6f3a r3fea4ca  
    1313]>
    1414
    15 <sect1 id="kdelibs" xreflabel="kdelibs-&kde-version;">
     15<sect1 id="kdelibs" xreflabel="kdelibs-&trinity-version;">
    1616  <?dbhtml filename="kdelibs.html"?>
    1717
     
    2121  </sect1info>
    2222
    23   <title>Kdelibs-&kde-version;</title>
     23  <title>Kdelibs-&trinity-version;</title>
    2424
    2525  <indexterm zone="kdelibs">
     
    5656      </listitem>
    5757    </itemizedlist>
    58 <!--
    59     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    60     <itemizedlist spacing="compact">
    61       <listitem>
    62         <para>Required patch: <ulink
    63         url="&patch-root;/kdelibs-&kde-version;-charset-1.patch"/></para>
    64       </listitem>
    65     </itemizedlist>
    66 -->
     58
    6759    <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
    6860
  • kde/core/tqtinterface.xml

    rb5f6f3a r3fea4ca  
    8585cd       $BUILD  &amp;&amp;
    8686
    87 cmake $TGT                               \
     87cmake $TQT                               \
    8888  -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
    8989  -DCMAKE_VERBOSE_MAKEFILE=ON            \
Note: See TracChangeset for help on using the changeset viewer.