[rpms/chromium] epel9-next: try to fix cups22 again (hackishly)

[rpms/chromium] epel9-next: try to fix cups22 again (hackishly)

[Tom Callaway]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 098c7ea5bda01d99a9ac92b1b2e135f7c0929669
Author : Tom Callaway <spot@fedoraproject.org>
Date   : 2016-07-21T14:38:19-04:00
Stats  : +21/-5 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/098c7ea5bda01d99a9ac92b1b2e135f7c0929669?branch=epel9-next

Log:
try to fix cups22 again (hackishly)

---
diff --git a/chromium-52.0.2743.82-cups22.patch b/chromium-52.0.2743.82-cups22.patch
index b3823db..63d5116 100644
--- a/chromium-52.0.2743.82-cups22.patch
+++ b/chromium-52.0.2743.82-cups22.patch
@@ -1,7 +1,7 @@
 diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/printing/BUILD.gn
 --- chromium-52.0.2743.82/printing/BUILD.gn.cups22	2016-07-21 11:27:05.597507544 -0400
-+++ chromium-52.0.2743.82/printing/BUILD.gn	2016-07-21 11:27:25.565390048 -0400
-@@ -147,7 +147,7 @@ component("printing") {
++++ chromium-52.0.2743.82/printing/BUILD.gn	2016-07-21 14:36:45.574137758 -0400
+@@ -147,12 +147,13 @@ component("printing") {
                                   ],
                                   "trim string")
  
@@ -10,10 +10,16 @@ diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/pr
          cflags += [
            # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
            # API for now as supported Linux and Mac OS'es are still using
+           # older versions of CUPS. More info: crbug.com/226176
+           "-Wno-deprecated-declarations",
++          "-D_PPD_DEPRECATED=\"\"",
+           # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
+           # below.
+         ]
 diff -up chromium-52.0.2743.82/printing/printing.gyp.cups22 chromium-52.0.2743.82/printing/printing.gyp
 --- chromium-52.0.2743.82/printing/printing.gyp.cups22	2016-07-21 11:26:26.622746918 -0400
-+++ chromium-52.0.2743.82/printing/printing.gyp	2016-07-21 11:26:44.517632794 -0400
-@@ -142,7 +142,7 @@
++++ chromium-52.0.2743.82/printing/printing.gyp	2016-07-21 14:36:07.390373060 -0400
+@@ -142,12 +142,13 @@
              'cups_version': '<!(python cups_config_helper.py --api-version <(sysroot))',
            },
            'conditions': [
@@ -22,3 +28,9 @@ diff -up chromium-52.0.2743.82/printing/printing.gyp.cups22 chromium-52.0.2743.8
                'cflags': [
                  # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
                  # API for now as supported Linux and Mac OS'es are still using
+                 # older versions of CUPS. More info: crbug.com/226176
+                 '-Wno-deprecated-declarations',
++                '-D_PPD_DEPRECATED=""',
+                 # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
+                 # below.
+               ],

diff --git a/chromium.spec b/chromium.spec
index 1982f9e..90b76ed 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -62,7 +62,7 @@ BuildRequires:  libicu-devel >= 5.4
 
 Name:		chromium%{chromium_channel}
 Version:	52.0.2743.82
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
 License:	BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -1390,11 +1390,15 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %endif
 
 %changelog
+* Thu Jul 21 2016 Tom Callaway <spot@fedoraproject.org> 52.0.2743.82-2
+- try to fix cups 2.2 support again (hackishly)
+
 * Thu Jul 21 2016 Tom Callaway <spot@fedoraproject.org> 52.0.2743.82-1
 - update to 52.0.2743.82
 - handle locales properly
 - cleanup spec
 
+
 * Tue Jul 19 2016 Tom Callaway <spot@fedoraproject.org> 52.0.2743.75-1
 - update to 52.0.2743.75