Changeset 2cfb44a4


Ignore:
Timestamp:
07/14/2012 10:38:15 AM (12 years ago)
Author:
Ragnar Thomsen <rthomsen@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.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, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
5ef6186
Parents:
f342c0a9
Message:

Phonon-backen-gstreamer 4.6.1. Several KDE infrastructure changes.

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

Files:
36 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rf342c0a9 r2cfb44a4  
    44-->
    55
    6 <!ENTITY day          "12">                   <!-- Always 2 digits -->
     6<!ENTITY day          "14">                   <!-- Always 2 digits -->
    77<!ENTITY month        "07">                   <!-- Always 2 digits -->
    88<!ENTITY year         "2012">
    … …  
    1010<!ENTITY copyholder   "The BLFS Development Team">
    1111<!ENTITY version      "&year;-&month;-&day;">
    12 <!ENTITY releasedate  "July 12th, &year;">
     12<!ENTITY releasedate  "July 14th, &year;">
    1313<!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
    1414<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    … …  
    701701<!ENTITY kde-download-http           "http://mirrors.isc.org/pub/kde/stable/">
    702702<!ENTITY kde-download-ftp            "ftp://ftp.kde.org/pub/kde/stable/">
    703 <!ENTITY kde-dir-var                 "KDE4_PREFIX">
     703<!ENTITY kde-dir-var                 "KDE_PREFIX">
    704704<!ENTITY kde-dir                     "$&kde-dir-var;">
    705705<!ENTITY automoc4-version             "0.9.88">
    706706<!ENTITY phonon-version               "4.6.0">
    707 <!ENTITY phonon-backend-gstreamer-version "4.6.0">
     707<!ENTITY phonon-backend-gstreamer-version "4.6.1">
    708708<!ENTITY phonon-backend-vlc-version   "0.5.0">
    709709<!ENTITY attica-version               "0.4.0">

  • general/genutils/desktop-file-utils.xml

    rf342c0a9 r2cfb44a4  
    131131      <para>For <application>KDE</application>:</para>
    132132
    133 <screen><literal>XDG_DATA_DIRS=$KDE_PREFIX/share:/usr/local/share:/usr/share
     133<screen><literal>XDG_DATA_DIRS=&kde-dir;/share:/usr/local/share:/usr/share
    134134XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
    135135export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
    … …  
    145145      <application>KDE</application>:</para>
    146146
    147 <screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:$KDE_PREFIX/share
     147<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:&kde-dir;/share
    148148export XDG_DATA_DIRS</literal></screen>
    149149

  • general/prog/subversion.xml

    rf342c0a9 r2cfb44a4  
    103103      <xref linkend="dbus-glib"/>,
    104104      <xref linkend="gnome-keyring"/>,
    105       KWallet from KDE4 and
     105      KWallet from KDE and
    106106      <xref linkend="apache"/>.
    107107    </para>

  • gnome/deprecated/libgnomeui.xml

    rf342c0a9 r2cfb44a4  
    114114    <!-- seems bogus, no kde dependencies. dashes changed to plus to keep it
    115115    as a valid comment
    116    <para><option>++with-kde-datadir=$KDE_PREFIX/share</option>: Use this
     116   <para><option>++with-kde-datadir=&kde-dir;/share</option>: Use this
    117117    parameter if you have <application>KDE</application> installed in any prefix
    118118    other than <filename class='directory'>/usr</filename>.</para>-->

  • introduction/welcome/changelog.xml

    rf342c0a9 r2cfb44a4  
    4343-->
    4444    <listitem>
     45      <para>July 14th, 2012</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[rthomsen] - Changed the KDE system configuration file
     49          installation directory from /etc/kde4 to /etc/kde.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[rthomsen] - Removed the cmake option
     53          -DKDE_DEFAULT_HOME=.kde4 from KDE packages.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[rthomsen] - Use $KDE_PREFIX instead of $KDE4_PREFIX.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[rthomsen] - Phonon-backend-gstreamer 4.6.1.</para>
     60        </listitem>
     61      </itemizedlist>
     62    </listitem>
     63
     64
     65    <listitem>
    4566      <para>July 12th, 2012</para>
    4667      <itemizedlist>

  • kde4/add/add-pkgs.xml

    rf342c0a9 r2cfb44a4  
    4949<screen><userinput>mkdir build &amp;&amp;
    5050cd build &amp;&amp;
    51 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    52       -DKDE_DEFAULT_HOME=.kde4 \
    53       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     51cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     52      -DSYSCONF_INSTALL_DIR=/etc/kde \
    5453      .. &amp;&amp;
    5554make</userinput></screen>

  • kde4/add/ark.xml

    rf342c0a9 r2cfb44a4  
    9696<screen><userinput>mkdir build &amp;&amp;
    9797cd build &amp;&amp;
    98 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    99       -DKDE_DEFAULT_HOME=.kde4 \
    100       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     98cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     99      -DSYSCONF_INSTALL_DIR=/etc/kde \
    101100      .. &amp;&amp;
    102101make</userinput></screen>

  • kde4/add/gwenview.xml

    rf342c0a9 r2cfb44a4  
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    102       -DKDE_DEFAULT_HOME=.kde4 \
    103       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     101cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     102      -DSYSCONF_INSTALL_DIR=/etc/kde \
    104103      .. &amp;&amp;
    105104make</userinput></screen>
    … …  
    129128        <seg>gwenview and gwenview_importer</seg>
    130129        <seg>libgwenviewlib.so and gvpart.so</seg>
    131         <seg>several in $KDE4_PREFIX/share</seg>
     130        <seg>several in &kde-dir;/share</seg>
    132131      </seglistitem>
    133132    </segmentedlist>

  • kde4/add/kate.xml

    rf342c0a9 r2cfb44a4  
    9696<screen><userinput>mkdir build &amp;&amp;
    9797cd build &amp;&amp;
    98 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    99       -DKDE_DEFAULT_HOME=.kde4 \
    100       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     98cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     99      -DSYSCONF_INSTALL_DIR=/etc/kde \
    101100      .. &amp;&amp;
    102101make</userinput></screen>

  • kde4/add/kcalc.xml

    rf342c0a9 r2cfb44a4  
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    97       -DKDE_DEFAULT_HOME=.kde4 \
    98       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     96cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     97      -DSYSCONF_INSTALL_DIR=/etc/kde \
    9998      .. &amp;&amp;
    10099make</userinput></screen>
    … …  
    124123        <seg>kcalc</seg>
    125124        <seg>libkdeinit4_kcalc.so</seg>
    126         <seg>several in $KDE4_PREFIX/share</seg>
     125        <seg>several in &kde-dir;/share</seg>
    127126      </seglistitem>
    128127    </segmentedlist>

  • kde4/add/kde4admin.xml

    rf342c0a9 r2cfb44a4  
    101101cd build &amp;&amp;
    102102cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    103       -DKDE_DEFAULT_HOME=.kde4 \
    104       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     103      -DSYSCONF_INSTALL_DIR=/etc/kde \
    105104      .. &amp;&amp;
    106105make</userinput></screen>

  • kde4/add/kde4artwork.xml

    rf342c0a9 r2cfb44a4  
    7979    <para role="optional">
    8080    <xref linkend="libkexiv2"/>,
    81     <xref linkend="xscreensaver"/> (to use the xscreensavers in KDE4) and
     81    <xref linkend="xscreensaver"/> (to use the xscreensavers in KDE) and
    8282    <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (to build the krotation and kpendulum screensavers)
    8383    </para>
    … …  
    9797<screen><userinput>mkdir build &amp;&amp;
    9898cd build &amp;&amp;
    99 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    100       -DKDE_DEFAULT_HOME=.kde4 \
    101       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     99cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     100      -DSYSCONF_INSTALL_DIR=/etc/kde \
    102101      .. &amp;&amp;
    103102make</userinput></screen>
    … …  
    129128        klorenz.kss, kpartsaver.kss, kpendulum.kss, kpolygon.kss, krotation.kss,
    130129        kscience.kss, kslideshow.kss, ksolarwinds.kss, kvm.kss and kwave.kss</seg>
    131         <seg>several in $KDE4_PREFIX/lib/kde4</seg>
    132         <seg>several in $KDE4_PREFIX/share</seg>
     130        <seg>several in &kde-dir;/lib/kde4</seg>
     131        <seg>several in &kde-dir;/share</seg>
    133132      </seglistitem>
    134133    </segmentedlist>

  • kde4/add/kde4multimedia.xml

    rf342c0a9 r2cfb44a4  
    103103<screen><userinput>mkdir build &amp;&amp;
    104104cd build &amp;&amp;
    105 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    106       -DKDE_DEFAULT_HOME=.kde4 \
    107       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     105cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     106      -DSYSCONF_INSTALL_DIR=/etc/kde \
    108107      .. &amp;&amp;
    109108make</userinput></screen>
    … …  
    134133        <seg>libaudiocdplugins.so, libkcddb.so, libkcompactdisc.so
    135134        libkdeinit4_kmixctrl.so, libkdeinit4_kmix.so</seg>
    136         <seg>several in /etc/kde4, $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
     135        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
    137136      </seglistitem>
    138137    </segmentedlist>

  • kde4/add/kde4network.xml

    rf342c0a9 r2cfb44a4  
    66
    77  <!ENTITY kdenetwork-download-http "&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
    8   <!ENTITY kdenetwork-download-ftp  "&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
     8  <!ENTITY kdenetwork-download-ftp  "&kde-download-ftp;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
    99  <!ENTITY kdenetwork-md5sum        "f6749a63de31ed16725bb71bd0eafaca">
    1010  <!ENTITY kdenetwork-size          "8.5 MB">
    … …  
    118118<screen><userinput>mkdir build &amp;&amp;
    119119cd build &amp;&amp;
    120 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    121       -DKDE_DEFAULT_HOME=.kde4 \
    122       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     120cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     121      -DSYSCONF_INSTALL_DIR=/etc/kde \
    123122      .. &amp;&amp;
    124123make</userinput></screen>
    … …  
    151150        <seg>libkgetcore.so, libkopete*.so, libkyahoo.so, liboscar.so,
    152151        libkrdccore.so, libkrfbprivate.so, libqgroupwise.so and several
    153         in $KDE4_PREFIX/lib/kde4</seg>
    154         <seg>several in $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
     152        in &kde-dir;/lib/kde4</seg>
     153        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
    155154      </seglistitem>
    156155    </segmentedlist>

  • kde4/add/kde4pim.xml

    rf342c0a9 r2cfb44a4  
    103103<screen><userinput>mkdir build &amp;&amp;
    104104cd build &amp;&amp;
    105 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    106       -DKDE_DEFAULT_HOME=.kde4 \
    107       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     105cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     106      -DSYSCONF_INSTALL_DIR=/etc/kde \
    108107      .. &amp;&amp;
    109108make</userinput></screen>
    … …  
    137136        knode, knotes, konsolekalendar, kontact, korgac, korganizer, korganizer-mobile, ksendemail,
    138137        ktimetracker, kwatchgnupg, notes-mobile and tasks-mobile</seg>
    139         <seg>numerous in $KDE4_PREFIX/lib</seg>
     138        <seg>numerous in &kde-dir;/lib</seg>
    140139        <seg></seg>
    141140      </seglistitem>

  • kde4/add/kde4pimruntime.xml

    rf342c0a9 r2cfb44a4  
    9595<screen><userinput>mkdir build &amp;&amp;
    9696cd build &amp;&amp;
    97 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    98       -DKDE_DEFAULT_HOME=.kde4 \
    99       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     97cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     98      -DSYSCONF_INSTALL_DIR=/etc/kde \
    10099      .. &amp;&amp;
    101100make</userinput></screen>

  • kde4/add/kde4plasmaaddons.xml

    rf342c0a9 r2cfb44a4  
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    102       -DKDE_DEFAULT_HOME=.kde4 \
    103       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     101cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     102      -DSYSCONF_INSTALL_DIR=/etc/kde \
    104103      .. &amp;&amp;
    105104make</userinput></screen>
    … …  
    130129        <seg>liblancelot-datamodels.so, liblancelot.so, libplasma_groupingcontainment.so,
    131130        libplasmacomicprovidercore.so, libplasmapotdprovidercore.so, libplasmaweather.so,
    132         librtm.so and several in $KDE4_PREFIX/lib/kde4</seg>
     131        librtm.so and several in &kde-dir;/lib/kde4</seg>
    133132        <seg>...</seg>
    134133      </seglistitem>

  • kde4/add/konsole.xml

    rf342c0a9 r2cfb44a4  
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    97       -DKDE_DEFAULT_HOME=.kde4 \
    98       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     96cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     97      -DSYSCONF_INSTALL_DIR=/etc/kde \
    9998      .. &amp;&amp;
    10099make</userinput></screen>

  • kde4/add/libkexiv2.xml

    rf342c0a9 r2cfb44a4  
    9696<screen><userinput>mkdir build &amp;&amp;
    9797cd build &amp;&amp;
    98 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    99       -DKDE_DEFAULT_HOME=.kde4 \
    100       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     98cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     99      -DSYSCONF_INSTALL_DIR=/etc/kde \
    101100      .. &amp;&amp;
    102101make</userinput></screen>

  • kde4/add/okular.xml

    rf342c0a9 r2cfb44a4  
    110110cd build &amp;&amp;
    111111cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    112       -DKDE_DEFAULT_HOME=.kde4 \
    113       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     112      -DSYSCONF_INSTALL_DIR=/etc/kde \
    114113      .. &amp;&amp;
    115114make</userinput></screen>

  • kde4/core/config.xml

    rf342c0a9 r2cfb44a4  
    5151    the path to kdm according to your system):</para>
    5252   
    53 <screen><userinput>kd:5:respawn:/opt/kde4/bin/kdm</userinput></screen>
     53<screen><userinput>kd:5:respawn:&kde-dir;/bin/kdm</userinput></screen>
    5454
    5555    <para>Additionally, you need to change the default run-level from 3 to 5. This

  • kde4/core/kactivities.xml

    rf342c0a9 r2cfb44a4  
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    97       -DKDE_DEFAULT_HOME=.kde4 \
    98       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     96cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     97      -DSYSCONF_INSTALL_DIR=/etc/kde \
    9998      .. &amp;&amp;
    10099make</userinput></screen>
    … …  
    124123        <seg>kactivitymanagerd</seg>
    125124        <seg>libactivities.so and activitymanager_plugin_*.so</seg>
    126         <seg>$KDE4_PREFIX/include/kactivities and $KDE4_PREFIX/include/KDE/KActivities</seg>
     125        <seg>&kde-dir;/include/kactivities and &kde-dir;/include/KDE/KActivities</seg>
    127126      </seglistitem>
    128127    </segmentedlist>

  • kde4/core/kde4baseapps.xml

    rf342c0a9 r2cfb44a4  
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    102       -DKDE_DEFAULT_HOME=.kde4 \
    103       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     101cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     102      -DSYSCONF_INSTALL_DIR=/etc/kde \
    104103      .. &amp;&amp;
    105104make</userinput></screen>
    … …  
    132131        <seg>libkonq.so, libdolphinprivate.so, libkbookmarkmodel_private.so,
    133132        libkdeinit4_keditbookmarks.so, libkonquerorprivate.so, libkonqsidebarplugin.so,
    134         libkdeinit4_dolphin.so and several in $KDE4_PREFIX/lib/kde4</seg>
     133        libkdeinit4_dolphin.so and several in &kde-dir;/lib/kde4</seg>
    135134        <seg>...</seg>
    136135      </seglistitem>

  • kde4/core/kde4libs.xml

    rf342c0a9 r2cfb44a4  
    66
    77  <!ENTITY kdelibs-download-http "&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
    8   <!ENTITY kdelibs-download-ftp  "&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
     8  <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
    99  <!ENTITY kdelibs-md5sum        "c4987c838164bd9ee2787e77243fe4a9">
    1010  <!ENTITY kdelibs-size          "11.4 MB">
    … …  
    125125<screen><userinput>mkdir build &amp;&amp;
    126126cd build &amp;&amp;
    127 cmake -DCMAKE_INSTALL_PREFIX=$&kde-dir-var; \
    128       -DKDE_DEFAULT_HOME=.kde4 \
    129       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     127cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     128      -DSYSCONF_INSTALL_DIR=/etc/kde \
    130129      -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
    131130      .. &amp;&amp;
    … …  
    141140    <title>Command Explanations</title>
    142141
    143     <para><option>-DKDE_DEFAULT_HOME=.kde4</option>: This option is set to
    144     avoid clashes with a KDE3 installation on the same machine.</para>
    145     <para><option>-DSYSCONF_INSTALL_DIR=/etc/kde4</option>: This option is set to
     142    <para><option>-DSYSCONF_INSTALL_DIR=/etc/kde</option>: This option is set to
    146143    install configuration files in /etc.</para>
    147144    <para><option>-DDOCBOOKXML_CURRENTDTD_DIR=...</option>: This option is used to
    … …  
    165162        meinproc_simple, nepomuk-rcgen and preparetips</seg>
    166163        <seg>several in &kde-dir;/lib</seg>
    167         <seg>several in /etc/kde4, &kde-dir;/include and &kde-dir;/share</seg>
     164        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
    168165      </seglistitem>
    169166    </segmentedlist>

  • kde4/core/kde4pimlibs.xml

    rf342c0a9 r2cfb44a4  
    103103<screen><userinput>mkdir build &amp;&amp;
    104104cd build &amp;&amp;
    105 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    106       -DKDE_DEFAULT_HOME=.kde4 \
    107       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     105cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     106      -DSYSCONF_INSTALL_DIR=/etc/kde \
    108107      .. &amp;&amp;
    109108make</userinput></screen>
    … …  
    132131      <seglistitem>
    133132        <seg>none</seg>
    134         <seg>several in $KDE4_PREFIX/lib</seg>
    135         <seg>several in $KDE4_PREFIX/include</seg>
     133        <seg>several in &kde-dir;/lib</seg>
     134        <seg>several in &kde-dir;/include</seg>
    136135      </seglistitem>
    137136    </segmentedlist>

  • kde4/core/kde4runtime.xml

    rf342c0a9 r2cfb44a4  
    108108cd build &amp;&amp;
    109109cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    110       -DKDE_DEFAULT_HOME=.kde4 \
    111       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     110      -DSYSCONF_INSTALL_DIR=/etc/kde \
    112111      .. &amp;&amp;
    113112make</userinput></screen>
    … …  
    144143        plasma-remote-helper and solid-hardware</seg>
    145144        <seg>several in &kde-dir;/lib</seg>
    146         <seg>several in /etc/kde4, &kde-dir;/include and &kde-dir;/share</seg>
     145        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
    147146      </seglistitem>
    148147    </segmentedlist>

  • kde4/core/kde4workspace.xml

    rf342c0a9 r2cfb44a4  
    3232    <para>The Kde-workspace package contains components that are central to
    3333    providing the <application>KDE</application> desktop environment. Of
    34     particular importance are KWin, the <application>KDE4</application>
     34    particular importance are KWin, the <application>KDE</application>
    3535    window manager, and Plasma, which provides the workspace interface.</para>
    3636
    … …  
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    7373    <para role="required">
    74     <xref linkend="kdelibs"/> and
    75     <xref linkend="kactivities"/> 
     74    <xref linkend="kdelibs"/>,
     75    <xref linkend="kactivities"/> and
     76    <xref linkend="qimageblitz"/>
    7677    </para>
    7778
    … …  
    114115<screen><userinput>mkdir build &amp;&amp;
    115116cd build &amp;&amp;
    116 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    117       -DKDE_DEFAULT_HOME=.kde4 \
    118       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     117cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     118      -DSYSCONF_INSTALL_DIR=/etc/kde \
    119119      -DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python2.7/site-packages \
    120120      .. &amp;&amp;
    … …  
    131131
    132132    <para><option>-DPYTHON_SITE_PACKAGES_INSTALL...</option>: This option is
    133     set to install the KDE4 Python objects in the correct place.</para>
     133    set to install the KDE Python objects in the correct place.</para>
    134134
    135135  </sect2>
    … …  
    152152        plasmawallpaperviewer, plasma-windowed, plasmoidviewer, solid-network,
    153153        solid-action-desktop-gen, startkde and systemsettings</seg>
    154         <seg>several in $KDE4_PREFIX/lib</seg>
    155         <seg>several in /etc/kde4, $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
     154        <seg>several in &kde-dir;/lib</seg>
     155        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
    156156      </seglistitem>
    157157    </segmentedlist>

  • kde4/core/oxygen-icons.xml

    rf342c0a9 r2cfb44a4  
    115115        <seg>none</seg>
    116116        <seg>none</seg>
    117         <seg>$KDE4_PREFIX/share/icons/oxygen</seg>
     117        <seg>&kde-dir;/share/icons/oxygen</seg>
    118118      </seglistitem>
    119119    </segmentedlist>

  • kde4/core/phonon-backend-gstreamer.xml

    rf342c0a9 r2cfb44a4  
    77  <!ENTITY phonon-backend-gstreamer-download-http "http://mirrors.isc.org/pub/kde/stable/phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
    88  <!ENTITY phonon-backend-gstreamer-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
    9   <!ENTITY phonon-backend-gstreamer-md5sum        "cc380c7612aaaa87294185ded702f88a">
     9  <!ENTITY phonon-backend-gstreamer-md5sum        "c0c8a1064e32c83dd6976187dcc491a3">
    1010  <!ENTITY phonon-backend-gstreamer-size          "70 KB">
    11   <!ENTITY phonon-backend-gstreamer-buildsize     "3.1 MB">
     11  <!ENTITY phonon-backend-gstreamer-buildsize     "4.0 MB">
    1212  <!ENTITY phonon-backend-gstreamer-time          "0.3 SBU">
    1313]>
    … …  
    3333    utilizes the <application>GStreamer</application> media framework.</para>
    3434
    35     &lfs70_checked;
     35    &lfs71_checked;
    3636
    3737    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8686<screen><userinput>mkdir build &amp;&amp;
    8787cd build &amp;&amp;
    88 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    89     .. &amp;&amp;
     88cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9089make</userinput></screen>
    9190
    … …  
    107106
    108107    <segmentedlist>
    109       <segtitle>Installed Program</segtitle>
     108      <segtitle>Installed Programs</segtitle>
    110109      <segtitle>Installed Libraries</segtitle>
    111       <segtitle>Installed Directory</segtitle>
     110      <segtitle>Installed Directories</segtitle>
    112111
    113112      <seglistitem>

  • kde4/core/phonon-backend-vlc.xml

    rf342c0a9 r2cfb44a4  
    8888<screen><userinput>mkdir build &amp;&amp;
    8989cd build &amp;&amp;
    90 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    91       .. &amp;&amp;
     90cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9291make</userinput></screen>
    9392

  • kde4/core/polkit-qt.xml

    rf342c0a9 r2cfb44a4  
    116116        <seg>None</seg>
    117117        <seg>libpolkit-qt-agent-1.so, libpolkit-qt-core-1.so and libpolkit-qt-gui-1.so</seg>
    118         <seg>$KDE4_PREFIX/include/polkit-qt-1</seg>
     118        <seg>&kde-dir;/include/polkit-qt-1</seg>
    119119      </seglistitem>
    120120    </segmentedlist>

  • kde4/core/qimageblitz.xml

    rf342c0a9 r2cfb44a4  
    3131
    3232    <para><application>QImageblitz</application> is a graphical effect and
    33     filter library for <application>KDE4</application>.</para>
     33    filter library for <application>KDE</application>.</para>
    3434
    3535    &lfs70_checked;
    … …  
    8787<screen><userinput>mkdir build &amp;&amp;
    8888cd build &amp;&amp;
    89 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX .. &amp;&amp;
     89cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9090make</userinput></screen>
    9191
    … …  
    114114        <seg>blitztest</seg>
    115115        <seg>libqimageblitz.so</seg>
    116         <seg>$KDE4_PREFIX/include/qimageblitz</seg>
     116        <seg>&kde-dir;/include/qimageblitz</seg>
    117117      </seglistitem>
    118118    </segmentedlist>

  • kde4/intro/pre-install-config.xml

    rf342c0a9 r2cfb44a4  
    3232    class='directory'>/opt</filename> hierarchy:</para>
    3333
    34 <screen><userinput>export &kde-dir-var;=/opt/kde4</userinput></screen>
     34<screen><userinput>export &kde-dir-var;=/opt/kde</userinput></screen>
    3535
    3636    <para>If you are not installing <application>KDE</application> in
    … …  
    3939    system or personal profile:</para>
    4040
    41 <screen><userinput>cat &gt; /etc/profile.d/kde4.sh &lt;&lt; "EOF"
    42 # Begin /etc/profile.d/kde4.sh
     41<screen><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; "EOF"
     42# Begin /etc/profile.d/kde.sh
    4343
    44 &kde-dir-var;=/opt/kde4
    45 KDE4DIR=&kde-dir;
     44&kde-dir-var;=/opt/kde
    4645KDEDIR=&kde-dir;
    4746
    … …  
    5049pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
    5150pathappend &kde-dir;/share           XDG_DATA_DIRS
    52 pathappend /etc/kde4/xdg                XDG_CONFIG_DIRS
     51pathappend /etc/kde/xdg                XDG_CONFIG_DIRS
    5352
    54 export KDE4_PREFIX KDE4DIR KDEDIR
     53export &kde-dir-var; KDEDIR
    5554
    56 # End /etc/profile.d/kde4.sh
     55# End /etc/profile.d/kde.sh
    5756EOF
    5857</userinput></screen>
    … …  
    6160
    6261<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
    63 <literal># Begin kde4 addition
     62<literal># Begin kde addition
    6463
    65 /opt/kde4/lib
     64/opt/kde/lib
    6665
    67 # End kde4 addition</literal>
     66# End kde addition</literal>
    6867EOF</userinput></screen>
    6968
    7069    <indexterm zone="kde-pre-install-config">
    7170      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
    72     </indexterm>
    73 
    74     <para>Add to your <filename>/etc/man_db.conf</filename>:</para>
    75 
    76 <screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
    77 <literal># Begin kde4 addition
    78 
    79 MANDATORY_MANPATH /opt/kde4/man
    80 
    81 # End kde4 addition</literal>
    82 EOF</userinput></screen>
    83 
    84     <indexterm zone="kde-pre-install-config">
    85       <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
    8671    </indexterm>
    8772
    … …  
    9176    the following symlinks (as the <systemitem class="username">root</systemitem> user):</para>
    9277
    93 <screen role="root"><userinput>install -d /opt/kde4/share &amp;&amp;
    94 ln -svf /usr/share/dbus-1 /opt/kde4/share &amp;&amp;
    95 ln -svf /usr/share/polkit-1 /opt/kde4/share</userinput></screen>
     78<screen role="root"><userinput>install -d &kde-dir;/share &amp;&amp;
     79ln -svf /usr/share/dbus-1 &kde-dir;/share &amp;&amp;
     80ln -svf /usr/share/polkit-1 &kde-dir;/share</userinput></screen>
    9681   
    9782    <para>D-Bus also needs to find the configuration files for the system-wide
    9883    bus, which, if you follow the books instructions, are installed in
    99     <filename class="directory">/etc/kde4/dbus-1/system.d</filename>.
     84    <filename class="directory">/etc/kde/dbus-1/system.d</filename>.
    10085    Fix this by issuing the following (as
    10186    <systemitem class="username">root</systemitem>):</para>
    … …  
    10893&lt;busconfig&gt;
    10994
    110   &lt;includedir&gt;/etc/kde4/dbus-1/system.d&lt;/includedir&gt;
     95  &lt;includedir&gt;/etc/kde/dbus-1/system.d&lt;/includedir&gt;
    11196
    11297&lt;/busconfig&gt;</literal>
    … …  
    115100    <tip>
    116101      <para>Sometimes, the installation paths are coded into installed files.
    117       This is the reason why <filename class="directory">/opt/kde4</filename>
     102      This is the reason why <filename class="directory">/opt/kde</filename>
    118103      is used as installation prefix instead of <filename
    119104      class="directory">/opt/kde-&kde-version;</filename>.  After installing
    120       <application>KDE4</application>, you may rename the directory and create
     105      <application>KDE</application>, you may rename the directory and create
    121106      a symlink:</para>
    122107
    123 <screen role="root"><userinput>mv /opt/kde{4,-&kde-version;} &amp;&amp;
    124 ln -svf kde-&kde-version; /opt/kde4</userinput></screen>
     108<screen role="root"><userinput>mv /opt/kde{,-&kde-version;} &amp;&amp;
     109ln -svf kde-&kde-version; /opt/kde</userinput></screen>
    125110
    126111      <para>Later on, you may want to install other versions of
    127112      <application>KDE</application>.  To do that, just remove the symlink and
    128       use <filename class="directory">/opt/kde4</filename> as the prefix again
     113      use <filename class="directory">/opt/kde</filename> as the prefix again
    129114      (<application>KDE</application> must not be started). Which version of
    130115      <application>KDE</application> you use depends only on where the symlink

  • multimedia/audioutils/amarok.xml

    rf342c0a9 r2cfb44a4  
    66
    77  <!ENTITY amarok-download-http "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
    8   <!ENTITY amarok-download-ftp  "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
     8  <!ENTITY amarok-download-ftp  "&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
    99  <!ENTITY amarok-md5sum        "b7983eaa33e4771769ae9e330c811995">
    1010  <!ENTITY amarok-size          "44 MB">
    … …  
    3131
    3232    <para><application>Amarok</application> is a powerful audio player for
    33     the KDE4 environment.
     33    the KDE environment.
    3434    Features include a context browser, integration with many online music
    3535    services and support for management of several digital music players
    3636    including Apple's iPod.</para>
    3737   
    38     &lfs70_checked;
     38    &lfs71_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    104104<screen><userinput>mkdir build &amp;&amp;
    105105cd build &amp;&amp;
    106 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
    107       -DKDE_DEFAULT_HOME=.kde4 \
    108       -DSYSCONF_INSTALL_DIR=/etc/kde4 \
     106cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     107      -DSYSCONF_INSTALL_DIR=/etc/kde \
    109108      .. &amp;&amp;
    110109make</userinput></screen>
    … …  
    140139        libamarokcore.so, libamaroklib.so, libamarokocsclient.so,
    141140        libamarokpud.so, libampache_account_login.so and several
    142         libraries in $KDE4_PREFIX/lib/kde4</seg>
    143         <seg>several in $KDE4_PREFIX/share</seg>
     141        libraries in &kde-dir;/lib/kde4</seg>
     142        <seg>several in &kde-dir;/share</seg>
    144143      </seglistitem>
    145144    </segmentedlist>

  • multimedia/cdwriteutils/k3b.xml

    rf342c0a9 r2cfb44a4  
    142142
    143143<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-1.patch &amp;&amp;
    144 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX   \
    145       -DKDE_DEFAULT_HOME=.kde4              \
    146       -DSYSCONF_INSTALL_DIR=/etc/kde4       \
     144cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
     145      -DSYSCONF_INSTALL_DIR=/etc/kde        \
    147146      -DK3B_ENABLE_HAL_SUPPORT=OFF          \
    148147      ..  &amp;&amp;
    … …  
    208207        <seg>libk3b.so, libk3bdevice.so and numerous
    209208        modules for the installed dependencies</seg>
    210         <seg>The following subdirectories of <envar>$KDE_PREFIX</envar>/share/:
     209        <seg>The following subdirectories of <envar>&kde-dir;</envar>/share/:
    211210        applnk/Settings/System, apps/k3b, doc/HTML/en/k3b</seg>
    212211      </seglistitem>

  • server/other/virtuoso.xml

    rf342c0a9 r2cfb44a4  
    159159
    160160    <note><para>If <application>Virtuoso</application> is only to be used
    161     for <application>KDE4</application>, there is no need to start the
     161    for <application>KDE</application>, there is no need to start the
    162162    <application>Virtuoso</application> server at boot time.</para></note>
    163163   
Note: See TracChangeset for help on using the changeset viewer.