Changeset 866e54c

Timestamp:

08/15/2012 02:48:12 PM (12 years ago)

Author:

Krejzi <krejzi@…>

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:

be84951

Parents:

3ea5512

Message:

Fix G-S-D and G-C-C building with CUPS 1.6.0 and later.

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

Files:

• general/genlib/pcre.xml (modified) (1 diff)
• gnome/core/gnome-control-center.xml (modified) (2 diffs)
• gnome/core/gnome-settings-daemon.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/genlib/pcre.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY pcre-download-http " ">
+  <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-md5sum        "1c9a276af932b5599157f96e945391f0">

gnome/core/gnome-control-center.xml

@@ -73 +73 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gnome-control-center-&gnome-control-center-version;-cups-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GNOME Control Center Dependencies</bridgehead>
 
@@ -118 +128 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../gnome-control-center-&gnome-control-center-version;-cups-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --disable-static &amp;&amp;

gnome/core/gnome-settings-daemon.xml

@@ -70 +70 @@
         <para>
           Estimated build time: &gnome-settings-daemon-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gnome-settings-daemon-&gnome-settings-daemon-version;-cups-1.patch"/>
         </para>
       </listitem>
@@ -103 +113 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../gnome-settings-daemon-&gnome-settings-daemon-version;-cups-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --libexecdir=/usr/lib/gnome-settings-daemon \

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - Fix GNOME Control Center and GNOME Settings
+          Daemon build with CUPS 1.6.0 and later.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - MySQL 5.5.27. Fixes
           <ulink url="&blfs-ticket-root;3492">#3492</ulink>.</para>