diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2016-07-23 20:13:34 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2016-07-23 20:13:34 +0800 |
| commit | 3c7ffa91a77619baca628f692ddd723c89e10310 (patch) | |
| tree | 450c06be7d792621350c301d13bb0da5b4d25805 | |
| parent | 1a4d0951b1979d5c097b3154e55151879475949d (diff) | |
| download | copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.tar copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.tar.gz copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.tar.bz2 copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.tar.lz copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.tar.xz copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.tar.zst copr-rpm-spec-3c7ffa91a77619baca628f692ddd723c89e10310.zip | |
Fix CUPS 2.2 build problem on Fedora 25
| -rw-r--r-- | chromium/chromium/chromium-cups22.patch | 47 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 10 |
2 files changed, 56 insertions, 1 deletions
diff --git a/chromium/chromium/chromium-cups22.patch b/chromium/chromium/chromium-cups22.patch new file mode 100644 index 0000000..ac0700a --- /dev/null +++ b/chromium/chromium/chromium-cups22.patch @@ -0,0 +1,47 @@ +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 +--- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 2016-07-22 09:20:15.794340886 -0400 ++++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc 2016-07-22 09:20:26.338261197 -0400 +@@ -16,6 +16,7 @@ + #include "base/synchronization/lock.h" + #include "base/values.h" + #include "printing/backend/cups_helper.h" ++#include <cups/ppd.h> + #include "printing/backend/print_backend_consts.h" + #include "url/gurl.h" + +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 14:36:45.574137758 -0400 +@@ -147,12 +147,13 @@ component("printing") { + ], + "trim string") + +- if (cups_version == "1.6" || cups_version == "1.7") { ++ if (cups_version == "1.6" || cups_version == "1.7" || cups_version == "2.2") { + 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 14:36:07.390373060 -0400 +@@ -142,12 +142,13 @@ + 'cups_version': '<!(python cups_config_helper.py --api-version <(sysroot))', + }, + 'conditions': [ +- ['cups_version in ["1.6", "1.7"]', { ++ ['cups_version in ["1.6", "1.7", "2.2"]', { + '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/chromium/chromium.spec b/chromium/chromium/chromium.spec index 044dd1c..ad5b1a4 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -30,7 +30,7 @@ Name: chromium Version: 52.0.2743.82 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An open-source project that aims to build a safer, faster, and more stable browser Group: Applications/Internet @@ -47,6 +47,11 @@ Source2: chromium-browser.desktop # https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/chromium&id=14bce0f Patch0: chromium-PNGImageDecoder.patch +# Add a patch from Fedora to fix cups problem +# http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=098c7ea +# http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=4bca8d3 +Patch1: chromium-cups22.patch + # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -296,6 +301,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jul 22 2016 - Ting-Wei Lan <lantw44@gmail.com> - 52.0.2743.82-2 +- Fix build issue for cups 2.2 + * Thu Jul 21 2016 - Ting-Wei Lan <lantw44@gmail.com> - 52.0.2743.82-1 - Update to 52.0.2743.82 |