try to fix cups22 again (hackishly)

This commit is contained in:
Tom Callaway 2016-07-21 14:38:19 -04:00
parent 67f9e82fd0
commit 098c7ea5bd
2 changed files with 21 additions and 5 deletions

View File

@ -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.
],

View File

@ -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