[arch-commits] Commit in lib32-cairo/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, March 21, 2022 @ 23:40:09
  Author: heftig
Revision: 1168686

1.17.6-1

Modified:
  lib32-cairo/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-21 23:12:19 UTC (rev 1168685)
+++ PKGBUILD	2022-03-21 23:40:09 UTC (rev 1168686)
@@ -2,8 +2,8 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=lib32-cairo
-pkgver=1.17.4
-pkgrel=5
+pkgver=1.17.6
+pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices (32-bit)"
 url="https://cairographics.org/"
 arch=(x86_64)
@@ -12,31 +12,18 @@
          lib32-libxext lib32-libxrender lib32-libxcb lib32-glib2 lib32-pixman
          cairo)
 makedepends=(valgrind git meson)
-_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2  # tags/1.17.4^0
+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() {
@@ -48,11 +35,13 @@
     --libdir=/usr/lib32 \
     -D spectre=disabled \
     -D tee=enabled \
-    -D tests=disabled
+    -D tests=disabled \
+    -D symbol-lookup=disabled \
+    -D gtk_doc=false
   meson compile -C build
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
   rm -r "$pkgdir"/usr/{include,bin}
 }