Changeset c1b61c6 for kde/core/kdelibs.xml

Timestamp:

08/24/2014 06:34:04 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

3b705263

Parents:

7857007

Message:

Some checks and updates for KDE core section.

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

File:

• kde/core/kdelibs.xml (modified) (3 diffs)

kde/core/kdelibs.xml

@@ -33 +33 @@
     are central to development and execution of KDE programs.</para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57 +57 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4libs-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">KDELibs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="attica"/>,
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>,
+      <xref linkend="giflib"/>,
+      <xref linkend="libdbusmenu-qt"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
       <xref linkend="phonon"/>,
-      <xref linkend="attica"/>,
-      <xref linkend="strigi"/>,
-      <xref linkend="libdbusmenu-qt"/>,
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="shared-mime-info"/>
+      <xref linkend="shared-mime-info"/>, and
+      <xref linkend="strigi"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="openssl"/>,
       <xref linkend="polkit-qt"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="qca"/>,
-      <xref linkend="upower"/>, and
-      <xref linkend="udisks"/> or <xref linkend="udisks2"/>
+      <xref linkend="udisks"/> or
+      <xref linkend="udisks2"/>, and
+      <xref linkend="upower"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="jasper"/>,
-      <xref linkend="pcre"/>,
+      <xref linkend="aspell"/>,
       <xref linkend="avahi"/>,
-      <xref linkend="aspell"/>,
       <xref linkend="enchant"/>,
       <xref linkend="grantlee"/>,
+      <xref linkend="jasper"/>,
       <xref linkend="mitkrb"/>,
-      <ulink url="&sourceforge-repo;/soprano">soprano</ulink>,
-      <ulink url="&sourceforge-repo;/oscaf/">shared-desktop-ontologies</ulink>,
+      <xref linkend="pcre"/>,
+      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>,
       <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
-      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>,
       <ulink url="http://www.herqq.org/">HUPnP</ulink>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info">media-player-info</ulink>
+      <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info">media-player-info</ulink>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
+      <ulink url="&sourceforge-repo;/oscaf/">Shared-Desktop-Ontologies</ulink>, and
+      <ulink url="&sourceforge-repo;/soprano/">Soprano</ulink>
     </para>
 
@@ -118 +110 @@
     <title>Installation of KDELibs</title>
 
-    <para>Fix file conflicts with <application>GNOME Menus</application> by running
-    the following commands:</para>
-
-<screen><userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@&amp; RENAME kde-applications.menu@" \
-        kded/CMakeLists.txt &amp;&amp;
-
-sed -i "s@applications.menu@kde-&amp;@" \
-        kded/kbuildsycoca.cpp</userinput></screen>
-
     <para>
-       Fix building with <xref linkend="giflib"/>:
-    </para>
-
-<screen><userinput>sed -i "/DGifCloseFile/s:file:&amp;, NULL:g" \
-       khtml/imload/decoders/gifloader.cpp</userinput></screen>
-
-<!--
-    <para>Cmake looks for <application>Xorg</application> libraries in a set of
-    hard coded directories instead of using
-    <application>pkg-config</application>.  If <application>Xorg</application>
-    has not been installed in <filename class="directory">/usr</filename>, add
-    the location to the list:</para>
-
-<screen><userinput>sed -e "/SET(X11_LIB_SEARCH_PATH/ a $XORG_PREFIX/lib"     \
-    -e "/SET(X11_INC_SEARCH_PATH/ a $XORG_PREFIX/include" \
-    -i cmake/modules/FindX11.cmake</userinput></screen>
--->
+      First, silence a lot of warnings caused by using the latest toolchain
+      by running the following command:
+    </para>
+
+<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g"      \
+                          cmake/modules/FindKDE4Internal.cmake \
+                          kjsembed/qtonly/FindQJSInternal.cmake</userinput></screen>
+
     <para>Install <application>KDELibs</application> by running the following
     commands:</para>