[arch-commits] Commit in cairo/trunk (PKGBUILD)
Jan Steffens
heftig at gemini.archlinux.org
Mon Mar 21 23:40:27 UTC 2022
Date: Monday, March 21, 2022 @ 23:40:27
Author: heftig
Revision: 440444
1.17.6-1
Modified:
cairo/trunk/PKGBUILD
----------+
PKGBUILD | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-21 23:24:09 UTC (rev 440443)
+++ PKGBUILD 2022-03-21 23:40:27 UTC (rev 440444)
@@ -1,10 +1,10 @@
# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
# Contributor: Brice Carpentier <brice at daknet.org>
pkgname=cairo
-pkgver=1.17.4
-pkgrel=5
+pkgver=1.17.6
+pkgrel=1
pkgdesc="2D graphics library with support for multiple output devices"
url="https://cairographics.org/"
arch=(x86_64)
@@ -11,32 +11,19 @@
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
+makedepends=(valgrind git meson gtk-doc)
+options=(debug)
+_commit=b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 # tags/1.17.6^0
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd cairo
- git describe --tags | sed 's/-/+/g'
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
}
prepare() {
cd cairo
-
- # Fix library versioning
- # https://bugs.archlinux.org/task/69012
- git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184
-
- # https://bugs.archlinux.org/task/70017 (CVE-2020-35492)
- git cherry-pick -n 03a820b173ed1fdef6ff14b4468f5dbc02ff59be
-
- # 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 cherry-pick -n 3468c67fe91f0c37e0ec5d335082653a6fa609b6
}
build() {
@@ -43,10 +30,12 @@
arch-meson cairo build \
-D spectre=disabled \
-D tee=enabled \
- -D tests=disabled
+ -D tests=disabled \
+ -D symbol-lookup=disabled \
+ -D gtk_doc=true
meson compile -C build
}
package() {
- DESTDIR="$pkgdir" meson install -C build
+ meson install -C build --destdir "$pkgdir"
}
More information about the arch-commits
mailing list