Changeset a92a3a9

Timestamp:

02/11/2015 06:19:52 PM (9 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0b72043

Parents:

fa58dc7

Message:

Add patch to cups-filters to fix building with poppler-0.31.0.
Update to cups-2.0.2.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• pst/printing/cups-filters.xml (modified) (3 diffs)
• pst/printing/cups.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <para>February 11th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add patch to cups-filters to fix
+          building with poppler-0.31.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cups-2.0.2. Fixes
+          <ulink url="&blfs-ticket-root;6131">#6131</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to xorg-server-1.17.1. Fixes

packages.ent

@@ -713 +713 @@
 <!-- Part XII -->
 <!-- Chapter 42 -->
-<!ENTITY cups-version                 "2.0.1">
+<!ENTITY cups-version                 "2.0.2">
 <!ENTITY cups-filters-version         "1.0.62">
 <!ENTITY gs-version                   "9.15">

pst/printing/cups-filters.xml

@@ -74 +74 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/cups-filters-&cups-filters-version;-poppler_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
 
@@ -120 +130 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                               \
-            --sysconfdir=/etc                           \
-            --localstatedir=/var                        \
-            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; \
-            --without-rcdir                             \
-            --with-gs-path=/usr/bin/gs                  \
-            --with-pdftops-path=/usr/bin/gs             \
-            --disable-static                            &amp;&amp;
+<screen><userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler_fix-1.patch &amp;&amp;
+
+./configure --prefix=/usr                   \
+            --sysconfdir=/etc               \
+            --localstatedir=/var            \
+            --without-rcdir                 \
+            --disable-static                \
+            --with-gs-path=/usr/bin/gs      \
+            --with-pdftops-path=/usr/bin/gs \
+            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
 make</userinput></screen>
 
@@ -144 +156 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>patch ...</command>: Allow the package to build with 
+      poppler-0.31.0 and later.
+    </para>
 
     <para>

pst/printing/cups.xml

@@ -7 +7 @@
   <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "7f7c33071035fb20d0879929a42da711">
+  <!ENTITY cups-md5sum        "6e0ea72dbafcf5baaa1cf4178e71096d">
   <!ENTITY cups-size          "8.4 MB">
-  <!ENTITY cups-buildsize     "60 MB (additional 28 MB for the tests)">
+  <!ENTITY cups-buildsize     "61 MB (additional 28 MB for the tests)">
   <!ENTITY cups-time          "0.5 SBU (additional 4.4 SBU for the tests)">
 ]>
@@ -215 +215 @@
     </para>
 
-<screen><userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in           &amp;&amp;
-sed -i '/MAN.*.EXT/s:.gz::g' \
-       configure config-scripts/cups-manpages.m4       &amp;&amp;
-sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &amp;&amp;
-sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' \
-       test/ippserver.c                                &amp;&amp;
+<screen><userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in                                  &amp;&amp;
+sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4          &amp;&amp;
+sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4                        &amp;&amp;
+sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
 
 aclocal  -I config-scripts &amp;&amp;
@@ -232 +230 @@
 make</userinput></screen>
 
-   <para>
-     To test the results, issue: <command>make -k check</command>. An already
-     active graphical session with bus address is necessary to run the tests.
-     A small number of tests fail for unknown reasons.
-   </para>
+    <para>
+      To test the results, issue: <command>make -k check</command>. An already
+      active graphical session with bus address is necessary to run the tests.
+      A small number of tests fail for unknown reasons.
+    </para>
 
     <para>