cups22.patch

   1 diff -up chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 chromium-52.0.2743.82/printing/backend/print_backend_cups.cc
   2 --- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 2016-07-22 09:20:15.794340886 -0400
   3 +++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc        2016-07-22 09:20:26.338261197 -0400
   4 @@ -16,6 +16,7 @@
   5  #include "base/synchronization/lock.h"
   6  #include "base/values.h"
   7  #include "printing/backend/cups_helper.h"
   8 +#include <cups/ppd.h>
   9  #include "printing/backend/print_backend_consts.h"
  10  #include "url/gurl.h"
  11
  12 diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/printing/BUILD.gn
  13 --- chromium-52.0.2743.82/printing/BUILD.gn.cups22      2016-07-21 11:27:05.597507544 -0400
  14 +++ chromium-52.0.2743.82/printing/BUILD.gn     2016-07-21 14:36:45.574137758 -0400
  15 @@ -147,12 +147,13 @@ component("printing") {
  16                                   ],
  17                                   "trim string")
  18
  19 -      if (cups_version == "1.6" || cups_version == "1.7") {
  20 +      if (cups_version == "1.6" || cups_version == "1.7" || cups_version == "2.2") {
  21          cflags += [
  22            # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
  23            # API for now as supported Linux and Mac OS'es are still using
  24            # older versions of CUPS. More info: crbug.com/226176
  25            "-Wno-deprecated-declarations",
  26 +          "-D_PPD_DEPRECATED=",
  27            # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
  28            # below.
  29          ]
  30 diff -up chromium-52.0.2743.82/printing/printing.gyp.cups22 chromium-52.0.2743.82/printing/printing.gyp
  31 --- chromium-52.0.2743.82/printing/printing.gyp.cups22  2016-07-21 11:26:26.622746918 -0400
  32 +++ chromium-52.0.2743.82/printing/printing.gyp 2016-07-21 14:36:07.390373060 -0400
  33 @@ -142,12 +142,13 @@
  34              'cups_version': '<!(python cups_config_helper.py --api-version <(sysroot))',
  35            },
  36            'conditions': [
  37 -            ['cups_version in ["1.6", "1.7"]', {
  38 +            ['cups_version in ["1.6", "1.7", "2.2"]', {
  39                'cflags': [
  40                  # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
  41                  # API for now as supported Linux and Mac OS'es are still using
  42                  # older versions of CUPS. More info: crbug.com/226176
  43                  '-Wno-deprecated-declarations',
  44 +                '-D_PPD_DEPRECATED=""',
  45                  # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
  46                  # below.
  47                ],