Changeset a77c2fb

Timestamp:

05/01/2014 07:36:12 AM (10 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 7.10, 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/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

a572b170

Parents:

b176eea

Message:

Patch CUPS in order to remove the dependency on Avahi
+ typo

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/printing/cups.xml (modified) (3 diffs)
• xincludes/gtk-update-icon-cache.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "29">                   <!-- Always 2 digits -->
-<!ENTITY month        "04">                   <!-- Always 2 digits -->
+<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 29th, &year;">
+<!ENTITY releasedate  "May 1st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
+      <para>May 1st, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch CUPS in order to remove dependency
+          on Avahi.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 29th, 2014</para>
       <itemizedlist>

pst/printing/cups.xml

@@ -83 +83 @@
       <listitem>
         <para>
+          Required patch: <!-- should not be needed for 1.7.3 -->
+          <ulink url="&patch-root;/cups-&cups-version;-avahi_optional-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Optional patch:
           <ulink url="&patch-root;/cups-&cups-version;-content_type-1.patch"/>
@@ -91 +97 @@
     <bridgehead renderas="sect3">Cups Dependencies</bridgehead>
 
+<!-- Not needed now, with the patch
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-<!-- Bug in 1.7.2 implies that cups cannot be built without avahi or dnssd.
-     Check that this is still required for next versions -->
       <xref linkend="avahi"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -234 +239 @@
     introduce some difficulties with packaging -->
 <screen><userinput>patch -Np1 -i ../cups-&cups-version;-blfs-1.patch &amp;&amp;
+patch -Np1 -i ../cups-&cups-version;-avahi_optional-1.patch &amp;&amp;
 aclocal -I config-scripts &amp;&amp;
 autoconf -I config-scripts &amp;&amp;

xincludes/gtk-update-icon-cache.xml

@@ -8 +8 @@
     <note>
       <para>
-        This package installes icon files into the
+        This package installs icon files into the
         <filename class="directory">/usr/share/icons/hicolor</filename>
         hierarchy and you can improve system performance and memory usage by