Author: krejzi Date: 2012-08-15 08:48:12 -0600 (Wed, 15 Aug 2012) New Revision: 10523
Modified: trunk/BOOK/general/genlib/pcre.xml trunk/BOOK/gnome/core/gnome-control-center.xml trunk/BOOK/gnome/core/gnome-settings-daemon.xml trunk/BOOK/introduction/welcome/changelog.xml Log: Fix G-S-D and G-C-C building with CUPS 1.6.0 and later. Modified: trunk/BOOK/general/genlib/pcre.xml =================================================================== --- trunk/BOOK/general/genlib/pcre.xml 2012-08-15 10:46:06 UTC (rev 10522) +++ trunk/BOOK/general/genlib/pcre.xml 2012-08-15 14:48:12 UTC (rev 10523) @@ -4,7 +4,7 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %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"> <!ENTITY pcre-size "1.2 MB"> Modified: trunk/BOOK/gnome/core/gnome-control-center.xml =================================================================== --- trunk/BOOK/gnome/core/gnome-control-center.xml 2012-08-15 10:46:06 UTC (rev 10522) +++ trunk/BOOK/gnome/core/gnome-control-center.xml 2012-08-15 14:48:12 UTC (rev 10523) @@ -72,6 +72,16 @@ </listitem> </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> <bridgehead renderas="sect4">Required</bridgehead> @@ -117,7 +127,8 @@ following commands: </para> -<screen><userinput>./configure --prefix=/usr \ +<screen><userinput>patch -Np1 -i ../gnome-control-center-&gnome-control-center-version;-cups-1.patch && +./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-static && make</userinput></screen> Modified: trunk/BOOK/gnome/core/gnome-settings-daemon.xml =================================================================== --- trunk/BOOK/gnome/core/gnome-settings-daemon.xml 2012-08-15 10:46:06 UTC (rev 10522) +++ trunk/BOOK/gnome/core/gnome-settings-daemon.xml 2012-08-15 14:48:12 UTC (rev 10523) @@ -73,6 +73,16 @@ </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> + </itemizedlist> + <bridgehead renderas="sect3">GNOME Settings Daemon Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> @@ -102,7 +112,8 @@ commands: </para> -<screen><userinput>./configure --prefix=/usr \ +<screen><userinput>patch -Np1 -i ../gnome-settings-daemon-&gnome-settings-daemon-version;-cups-1.patch && +./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-settings-daemon \ --disable-packagekit \ Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2012-08-15 10:46:06 UTC (rev 10522) +++ trunk/BOOK/introduction/welcome/changelog.xml 2012-08-15 14:48:12 UTC (rev 10523) @@ -47,6 +47,10 @@ <para>August 15th, 2012</para> <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> </listitem> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
