Changeset 3d16a42

Timestamp:

05/18/2021 09:00:30 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

7246c35

Parents:

f8cde65

Message:

Use OpenPrinting CUPS

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/printing/cups.xml (modified) (9 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem revision="sysv">
+          <para>[thomas] - Use OpenPrinting CUPS. Thanks to Marty Jack for
+            the pointer.</para>
+        </listitem>
+        <listitem revision="sysv">
           <para>[pierre] - gnome-shell: add a patch to fix a failure to start
           xwayland applications on non systemd.</para>

pst/printing/cups.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY cups-download-http "https://github.com/apple/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
+  <!ENTITY cups-download-http "https://github.com/OpenPrinting/cups/releases/download/v&cups-version;op2/cups-&cups-version;op2-source.tar.gz">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "412434ceefbdf3ec71bc9188a035f589">
-  <!ENTITY cups-size          "7.8 MB">
+  <!ENTITY cups-md5sum        "524266752cf243c968921547b18ee594">
+  <!ENTITY cups-size          "7.6 MB">
   <!ENTITY cups-buildsize     "80 MB (Add 89 MB for tests)">
   <!ENTITY cups-time          "0.5 SBU (Add 0.9 SBU for tests)">
@@ -202 +202 @@
 
     <para>
+      Remove an invalid warning option:
+    </para>
+
+<screen><userinput>sed -e "s/-Wno-format-truncation//" \
+    -i configure \
+    -i config-scripts/cups-compiler.m4</userinput></screen>
+
+    <para>
       Build <application>Cups</application> by running the following commands:
     </para>
 
 
+<!-- This seems to be no longer required with OpenPrinting-cups.
+     Remove this comment when switch to OP is settled.
+
 <screen revision="sysv"><userinput>sed -i '/stat.h/a #include &lt;asm-generic/ioctls.h&gt;' tools/ipptool.c  &amp;&amp;
 
 CC=gcc CXX=g++ \
-./configure --libdir=/usr/lib            \
+-->
+<screen revision="sysv"><userinput>./configure --libdir=/usr/lib            \
             --disable-systemd            \
             --with-rcdir=/tmp/cupsinit   \
@@ -216 +228 @@
 make</userinput></screen>
 
+<!-- same apply here:
+
 <screen revision="systemd"><userinput>sed -i '/stat.h/a #include &lt;asm-generic/ioctls.h&gt;' tools/ipptool.c   &amp;&amp;
 
 CC=gcc CXX=g++ \
-./configure --libdir=/usr/lib            \
+-->
+<screen revision="sysv"><userinput>./configure --libdir=/usr/lib            \
             --with-rcdir=/tmp/cupsinit   \
             --with-system-groups=lpadmin \
@@ -228 +243 @@
       To test the results, issue: <command>LC_ALL=C make -k check</command>. An already
       active graphical session with bus address is necessary to run the tests.
+      Make sure that there is not other instance of <application>Cups</application>
+      running, otherwise at least 4 tests will fail with "address in use".
       <!--One test, <filename>httpAddrGetList</filename>, is known to fail.-->
     </para>
@@ -257 +274 @@
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed ... configure</command>: This sed removes a compiler
+      option which is no longer supported. Leaving this change out, the
+      compilation will run thru but a warning about an invalid
+      warning option will be emitted on every compiler invocation.
+    </para>
+<!--
     <para>
       <command>sed ... tools/ipptool.c</command>: This sed fixes a bug caused
@@ -268 +292 @@
       Installed disk space is not appreciably modified.
     </para>
-
+-->
     <para revision="sysv">
       <parameter>--disable-systemd</parameter>: Systemd is not supported by
@@ -421 +445 @@
            <!--accept,--> cancel, cupsaccept, <!--cupsaddsmb,--> cups-config, 
           cupsctl, cupsd, cupsdisable, cupsenable, cupsfilter, cupsreject,
-          <!--cupstestdsc,--> cupstestppd, ippeveprinter, ippfind, ipptool, lp,
+          <!--cupstestdsc,--> cupstestppd, ippeveprinter,<!-- ippfind--> ipptool, lp,
           lpadmin, lpc, lpinfo, lpmove, lpoptions, lpq, lpr, lprm, lpstat, ppdc,
           ppdhtml, ppdi, ppdmerge, and ppdpo <!--and reject-->
@@ -620 +644 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="ippfind">
         <term><command>ippfind</command></term>
@@ -632 +656 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="ipptool">
         <term><command>ipptool</command></term>