Changeset f685d3e

Timestamp:

05/20/2006 09:02:49 PM (18 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 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:

5ca9449

Parents:

1b58647

Message:

Added a patch to the kdelibs instructions so it will build if you have CUPS-1.2.x installed; the patch does not affect the build with lesser versions of CUPS; thanks to Matthew Carson for chasing down the problem and sending in the patch

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• kde/core/kdelibs.xml (modified) (5 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a patch to the kdelibs instructions so it
+          will build if you have CUPS-1.2.x installed. The patch does not
+          affect the build with lesser versions of CUPS. Thanks to Matthew
+          Carson for chasing down the problem and sending in the patch.</para>
+        </listitem>
+        <listitem>
           <para>[dnicholson] - Added -ifv arguments to the autoreconf
           command in libdrm so that libtoolize will be run.  The shared

kde/core/kdelibs.xml

@@ -4 +4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
   <!ENTITY kdelibs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
@@ -73 +61 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
     <bridgehead renderas="sect4">Required Patch</bridgehead>
 
     <itemizedlist spacing='compact'>
       <listitem>
-        <para><ulink url="ftp://ftp.kde.org/pub/kde/security_patches/post-3.4.3-kdelibs-kjs.diff"/></para>
+        <para><ulink url="&patch-root;/kdelibs-&kde-version;-cups1.2-1.patch"/></para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
@@ -111 +98 @@
     <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
     <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-    <ulink url="http://www.lua.org/">Lua</ulink>,
+    <ulink url="http://www.lua.org/">Lua</ulink> (version &lt; 5.1),
     <ulink url="http://www.opensource.apple.com/darwinsource/tarballs/apsl/">mDNSResponder</ulink>,
     <ulink url="http://sourceforge.net/projects/libthai">LibThai</ulink>,
@@ -131 +118 @@
     <para>Install <application>kdelibs</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
-    --disable-debug --disable-dependency-tracking &amp;&amp;
+<screen><userinput>patch -Np1 -i ../kdelibs-&kde-version;-cups1.2-1.patch &amp;&amp;
+./configure --prefix=&kde-dir; \
+            --sysconfdir=/etc/kde \
+            --disable-debug \
+            --disable-dependency-tracking &amp;&amp;
 make</userinput></screen>
 
@@ -155 +145 @@
       </para>
     </note>
+
+    <para>This package does not come with a test suite that works with
+    <application>GCC</application>-&gcc-version;.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>