Browse Source

[trunk] -> [extra] 'cairo-1.17.4-4' add

master
Dudemanguy 10 months ago
parent
commit
cf9ca5ebe8
Signed by: Dudemanguy GPG Key ID: 4003D2EF625D6492
  1. 13
      cairo/trunk/PKGBUILD
  2. 25
      cairo/trunk/xlib-xcb.diff
  3. 13
      cairo/x86_64/extra/PKGBUILD
  4. 25
      cairo/x86_64/extra/xlib-xcb.diff

13
cairo/trunk/PKGBUILD

@ -4,7 +4,7 @@
pkgname=cairo
pkgver=1.17.4
pkgrel=3
pkgrel=4
pkgdesc="2D graphics library with support for multiple output devices"
url="https://cairographics.org/"
arch=(x86_64)
@ -13,10 +13,8 @@ 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')
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd cairo
@ -30,9 +28,12 @@ prepare() {
# https://bugs.archlinux.org/task/69012
git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184
# https://gitlab.freedesktop.org/cairo/cairo/-/issues/449
git cherry-pick -n a3b69a0215fdface0fd5730872a4b3242d979dca
# Disable XCB backend for Xlib surfaces
# https://bugs.archlinux.org/task/68839
git apply -3 ../xlib-xcb.diff
git cherry-pick -n 3468c67fe91f0c37e0ec5d335082653a6fa609b6
}
build() {

25
cairo/trunk/xlib-xcb.diff

@ -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

13
cairo/x86_64/extra/PKGBUILD

@ -4,7 +4,7 @@
pkgname=cairo
pkgver=1.17.4
pkgrel=3
pkgrel=4
pkgdesc="2D graphics library with support for multiple output devices"
url="https://cairographics.org/"
arch=(x86_64)
@ -13,10 +13,8 @@ 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')
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd cairo
@ -30,9 +28,12 @@ prepare() {
# https://bugs.archlinux.org/task/69012
git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184
# https://gitlab.freedesktop.org/cairo/cairo/-/issues/449
git cherry-pick -n a3b69a0215fdface0fd5730872a4b3242d979dca
# Disable XCB backend for Xlib surfaces
# https://bugs.archlinux.org/task/68839
git apply -3 ../xlib-xcb.diff
git cherry-pick -n 3468c67fe91f0c37e0ec5d335082653a6fa609b6
}
build() {

25
cairo/x86_64/extra/xlib-xcb.diff

@ -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
Loading…
Cancel
Save