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

[Jan Steffens]

    Date: Saturday, October 5, 2019 @ 12:24:40
  Author: heftig
Revision: 512913

1.17.2+17+g52a7c79fd-2

Modified:
  lib32-cairo/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-05 11:07:38 UTC (rev 512912)
+++ PKGBUILD	2019-10-05 12:24:40 UTC (rev 512913)
@@ -2,7 +2,7 @@
 
 pkgname=lib32-cairo
 pkgver=1.17.2+17+g52a7c79fd
-pkgrel=1
+pkgrel=2
 pkgdesc="2D graphics library with support for multiple output devices (32-bit)"
 url="https://cairographics.org/"
 arch=(x86_64)
@@ -12,8 +12,10 @@
 makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
 checkdepends=(ttf-dejavu gsfonts)
 _commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc  # master
-source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
+        0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch)
+sha256sums=('SKIP'
+            '262bf1cebc04eaae93dbfab56045ad800b3b027be303ca2611375645108f171f')
 
 pkgver() {
   cd cairo
@@ -23,6 +25,9 @@
 prepare() {
   cd cairo
 
+  # https://bugs.archlinux.org/task/63856
+  patch -Np1 -i ../0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
+
   # Update gtk-doc
   cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
   cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc
@@ -36,7 +41,7 @@
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   cd cairo
   ./configure --prefix=/usr \