aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-11-04 14:57:40 +0000
committerTimo Teräs <timo.teras@iki.fi>2016-11-04 14:58:12 +0000
commit31a5bffd356ee50fd79d38a8833b992ead564d28 (patch)
treed708ac2fadbf476c1468679205deca5aa65f5520
parent396878847aa2a4fd58acf5bcc20cf4bd696d84bc (diff)
downloadaports-31a5bffd356ee50fd79d38a8833b992ead564d28.tar.bz2
aports-31a5bffd356ee50fd79d38a8833b992ead564d28.tar.xz
community/chromium: fix build against cups 2.2
-rw-r--r--community/chromium/APKBUILD6
-rw-r--r--community/chromium/cups22.patch15
2 files changed, 20 insertions, 1 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 07b6bf224..a69fc2fd1 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=chromium
pkgver=53.0.2785.143
-pkgrel=0
+pkgrel=1
pkgdesc="chromium web browser"
url="http://www.chromium.org/"
arch="x86_64"
@@ -36,6 +36,7 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
musl-sandbox.patch
unset-madv_free.patch
default-pthread-stacksize.patch
+ cups22.patch
chromium-system-jinja-r7.patch
chromium-widevine.patch
@@ -247,6 +248,7 @@ f99a4572c0be2c2123acc2478905e01f resolver.patch
c805e026abc748d9925fab8250760bcc musl-sandbox.patch
183bf3b136f99a0f60f8e171ddd147e8 unset-madv_free.patch
b034187a2c9046e8bb3e56b9055c56cf default-pthread-stacksize.patch
+db26100a8caef8b7e486c3b3ba5768a0 cups22.patch
97b1578585ab600ed9adef4f341ccd80 chromium-system-jinja-r7.patch
de717d6430532f34fe161035dfdafcdf chromium-widevine.patch
5f1bca53835b6380b5949c96860f6894 musl-hacks.patch"
@@ -263,6 +265,7 @@ ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211 no-getcontext.
3d0303f9ea04b2c24e16068ea2d423fce0e37ebb2b89dde342f9e8f9d0b149b4 musl-sandbox.patch
178fbdd552b21b7675425067b1c6ee84f6a24ec275bb40a0769d71072adfe482 unset-madv_free.patch
67b235079c768a5fb0f93203e5f13e1e4cd78ce217c48e858bca97d123a59fb8 default-pthread-stacksize.patch
+b0ff4ac02b9498e0bad07002c7fd522eb7b820b30c8b2f007db791eb46f53759 cups22.patch
872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071 chromium-system-jinja-r7.patch
1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874 chromium-widevine.patch
10a4d81e1d8f70e4993ba0b7e1b9069f18c28190e6660e0f67bf24d598aa7c66 musl-hacks.patch"
@@ -279,6 +282,7 @@ d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54
ce8276bb35a8d72cf58868a6331e85286b350a1aad694525ebf637499819219dd4d87ab67dd3b938830a6bd3e7172fc9bcd9c8971820d0ed95c0d141867a24fe musl-sandbox.patch
a86f262d6fde8497ba448052fa8777867633eff7eb71d91e56e005e2c00951a9f447d636e1bc86b682979b6746d1355963df0a6aaf4bb7ae9577226457493e09 unset-madv_free.patch
2767cbfda98a6ec40ccccab759c5de53155396c15fdb9789bf246947816e9f06833ce4730dc4845a936c1570951b88e78c098de244ee0706952375e679275ef2 default-pthread-stacksize.patch
+3c5a243d26220631e579e4763d3cae10e2193ca8b089f3882de97418f753a06332e3030a255c120e8ee4c58392a328751b323bfbd197e692886a37aefa34e4d2 cups22.patch
10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863 chromium-system-jinja-r7.patch
4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295 chromium-widevine.patch
4043dd7a64dcb9b73e15786b407934dd1b171df8b628ab1b18718fd93f9758c76eb25d1bdf1e1a22901544185088b8f817d3e2a58154c54949704dc8cc87b84d musl-hacks.patch"
diff --git a/community/chromium/cups22.patch b/community/chromium/cups22.patch
new file mode 100644
index 000000000..36d8069db
--- /dev/null
+++ b/community/chromium/cups22.patch
@@ -0,0 +1,15 @@
+https://codereview.chromium.org/download/issue2258333004_1_10001.diff
+
+Index: printing/backend/cups_helper.h
+diff --git a/printing/backend/cups_helper.h b/printing/backend/cups_helper.h
+index fd7601dc975978edc57c384d6fe92425d77e83cc..b72903ff89dee0a3261aaaf840675f41eb518411 100644
+--- a/printing/backend/cups_helper.h
++++ b/printing/backend/cups_helper.h
+@@ -6,6 +6,7 @@
+ #define PRINTING_BACKEND_CUPS_HELPER_H_
+
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+
+ #include "base/strings/string_piece.h"
+ #include "printing/printing_export.h"