Date: Friday, December 4, 2020 @ 12:29:01 Author: heftig Revision: 402860
1.17.4-2: FS#68839: Disable xlib-xcb Added: cairo/trunk/xlib-xcb.diff Modified: cairo/trunk/PKGBUILD ---------------+ PKGBUILD | 12 +++++++++--- xlib-xcb.diff | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-04 12:24:58 UTC (rev 402859) +++ PKGBUILD 2020-12-04 12:29:01 UTC (rev 402860) @@ -4,7 +4,7 @@ pkgname=cairo pkgver=1.17.4 -pkgrel=1 +pkgrel=2 pkgdesc="2D graphics library with support for multiple output devices" url="https://cairographics.org/"; arch=(x86_64) @@ -13,8 +13,10 @@ glib2 pixman) makedepends=(valgrind git meson) _commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2 # tags/1.17.4^0 -source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit";) -sha256sums=('SKIP') +source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"; + xlib-xcb.diff) +sha256sums=('SKIP' + '70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43') pkgver() { cd cairo @@ -23,6 +25,10 @@ prepare() { cd cairo + + # Disable XCB backend for Xlib surfaces + # https://bugs.archlinux.org/task/68839 + git apply -3 ../xlib-xcb.diff } build() { Added: xlib-xcb.diff =================================================================== --- xlib-xcb.diff (rev 0) +++ xlib-xcb.diff 2020-12-04 12:29:01 UTC (rev 402860) @@ -0,0 +1,25 @@ +diff --git i/meson.build w/meson.build +index b159b4071..2a1c68891 100644 +--- i/meson.build ++++ w/meson.build +@@ -313,7 +313,7 @@ endif + + if feature_conf.get('CAIRO_HAS_XCB_SURFACE', 0) == 1 and feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 + # FIXME: automagic +- x11xcb_dep = dependency('x11-xcb', required: false) ++ x11xcb_dep = dependency('x11-xcb', required: get_option('xlib-xcb')) + if x11xcb_dep.found() + deps += [x11xcb_dep] + feature_conf.set('CAIRO_HAS_XLIB_XCB_FUNCTIONS', 1) +diff --git i/meson_options.txt w/meson_options.txt +index ff11fe7ed..d1ae959e1 100644 +--- i/meson_options.txt ++++ w/meson_options.txt +@@ -17,6 +17,7 @@ option('qt', type : 'feature', value : 'disabled') + option('tee', type : 'feature', value : 'disabled') + option('xcb', type : 'feature', value : 'auto') + option('xlib', type : 'feature', value : 'auto') ++option('xlib-xcb', type : 'feature', value : 'disabled') + #option('xml', type : 'feature', value : 'disabled') + option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml surfaces +
