From a56e86441d51980ccee4f4ba1814692beddbf59c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 18 Sep 2016 10:38:41 +0200 Subject: [PATCH] chromium: fix build with cups-2.2 --- srcpkgs/chromium/patches/fix-cups-2.2.patch | 31 +++++++++++++++++++++ srcpkgs/chromium/template | 2 -- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/chromium/patches/fix-cups-2.2.patch diff --git a/srcpkgs/chromium/patches/fix-cups-2.2.patch b/srcpkgs/chromium/patches/fix-cups-2.2.patch new file mode 100644 index 00000000000..85559e13167 --- /dev/null +++ b/srcpkgs/chromium/patches/fix-cups-2.2.patch @@ -0,0 +1,31 @@ +commit 5132ca58a0a3ada1aee99732fd30d53ebe5af984 +author saiarcot895 Mon Aug 22 18:41:54 2016 +committer Commit bot Mon Aug 22 18:44:13 2016 +tree b4783f1c90f2fdb001843ad83463e260de9b292c +parent da7b21cac1ded0c70cb330e4f76a1f7915e38ccf + +Fix compiling with CUPS 2.2 backend. + +cupsGetPPD() and cupsGetPPD2() have been moved into the cups/ppd.h +header starting with CUPS 2.2. This header file now needs to be included +to use these functions. The header file also exists on older versions of +CUPS, so a compile error will not occur. + +R=skau@chromium.org, thestig@chromium.org + +Review-Url: https://codereview.chromium.org/2258333004 +Cr-Commit-Position: refs/heads/master@{#413484} + +diff --git printing/backend/cups_helper.h printing/backend/cups_helper.h +index fd7601d..b72903f 100644 +--- printing/backend/cups_helper.h ++++ printing/backend/cups_helper.h + +@@ -6,6 +6,7 @@ + #define PRINTING_BACKEND_CUPS_HELPER_H_ + + #include ++#include + + #include "base/strings/string_piece.h" + #include "printing/printing_export.h" diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 4273648a607..96bda6c49e7 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -15,8 +15,6 @@ lib32disabled=yes nodebug=yes nopie=yes # contains tools that are not PIE, enables PIE itself -broken="https://build.voidlinux.eu/builders/i686_builder/builds/25631/steps/shell_3/logs/stdio" - hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids libatomic-devel" makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel