Date: Thursday, December 17, 2020 @ 16:51:22 Author: heftig Revision: 404450
archrelease: copy trunk to extra-x86_64 Added: cairo/repos/extra-x86_64/PKGBUILD (from rev 404449, cairo/trunk/PKGBUILD) cairo/repos/extra-x86_64/xlib-xcb.diff (from rev 404449, cairo/trunk/xlib-xcb.diff) Deleted: cairo/repos/extra-x86_64/PKGBUILD cairo/repos/extra-x86_64/xlib-xcb.diff ---------------+ PKGBUILD | 92 +++++++++++++++++++++++++++++--------------------------- xlib-xcb.diff | 50 +++++++++++++++--------------- 2 files changed, 73 insertions(+), 69 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-12-17 16:50:59 UTC (rev 404449) +++ PKGBUILD 2020-12-17 16:51:22 UTC (rev 404450) @@ -1,44 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Brice Carpentier <br...@daknet.org> - -pkgname=cairo -pkgver=1.17.4 -pkgrel=2 -pkgdesc="2D graphics library with support for multiple output devices" -url="https://cairographics.org/" -arch=(x86_64) -license=(LGPL MPL) -depends=(lzo zlib libpng fontconfig freetype2 libx11 libxext libxrender libxcb - glib2 pixman) -makedepends=(valgrind git meson) -_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2 # tags/1.17.4^0 -source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit" - xlib-xcb.diff) -sha256sums=('SKIP' - '70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43') - -pkgver() { - cd cairo - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd cairo - - # Disable XCB backend for Xlib surfaces - # https://bugs.archlinux.org/task/68839 - git apply -3 ../xlib-xcb.diff -} - -build() { - arch-meson cairo build \ - -D spectre=disabled \ - -D tee=enabled \ - -D tests=disabled - meson compile -C build -} - -package() { - DESTDIR="$pkgdir" meson install -C build -} Copied: cairo/repos/extra-x86_64/PKGBUILD (from rev 404449, cairo/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-17 16:51:22 UTC (rev 404450) @@ -0,0 +1,48 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Brice Carpentier <br...@daknet.org> + +pkgname=cairo +pkgver=1.17.4 +pkgrel=3 +pkgdesc="2D graphics library with support for multiple output devices" +url="https://cairographics.org/" +arch=(x86_64) +license=(LGPL MPL) +depends=(lzo zlib libpng fontconfig freetype2 libx11 libxext libxrender libxcb + glib2 pixman) +makedepends=(valgrind git meson) +_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2 # tags/1.17.4^0 +source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit" + xlib-xcb.diff) +sha256sums=('SKIP' + '70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43') + +pkgver() { + cd cairo + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd cairo + + # Fix library versioning + # https://bugs.archlinux.org/task/69012 + git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184 + + # Disable XCB backend for Xlib surfaces + # https://bugs.archlinux.org/task/68839 + git apply -3 ../xlib-xcb.diff +} + +build() { + arch-meson cairo build \ + -D spectre=disabled \ + -D tee=enabled \ + -D tests=disabled + meson compile -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build +} Deleted: xlib-xcb.diff =================================================================== --- xlib-xcb.diff 2020-12-17 16:50:59 UTC (rev 404449) +++ xlib-xcb.diff 2020-12-17 16:51:22 UTC (rev 404450) @@ -1,25 +0,0 @@ -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 - Copied: cairo/repos/extra-x86_64/xlib-xcb.diff (from rev 404449, cairo/trunk/xlib-xcb.diff) =================================================================== --- xlib-xcb.diff (rev 0) +++ xlib-xcb.diff 2020-12-17 16:51:22 UTC (rev 404450) @@ -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 +