[arch-commits] Commit in lib32-cairo/repos/multilib-x86_64 (3 files)

[Jan Steffens]

    Date: Friday, December 4, 2020 @ 12:29:44
  Author: heftig
Revision: 769980

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD
    (from rev 769979, lib32-cairo/trunk/PKGBUILD)
  lib32-cairo/repos/multilib-x86_64/xlib-xcb.diff
    (from rev 769979, lib32-cairo/trunk/xlib-xcb.diff)
Deleted:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD

---------------+
 PKGBUILD      |   94 +++++++++++++++++++++++++++++---------------------------
 xlib-xcb.diff |   25 ++++++++++++++
 2 files changed, 75 insertions(+), 44 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-04 12:29:06 UTC (rev 769979)
+++ PKGBUILD	2020-12-04 12:29:44 UTC (rev 769980)
@@ -1,44 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=lib32-cairo
-pkgver=1.17.4
-pkgrel=1
-pkgdesc="2D graphics library with support for multiple output devices (32-bit)"
-url="https://cairographics.org/"
-arch=(x86_64)
-license=(LGPL MPL)
-depends=(lib32-zlib lib32-libpng lib32-fontconfig lib32-freetype2 lib32-libx11
-         lib32-libxext lib32-libxrender lib32-libxcb lib32-glib2 lib32-pixman
-         cairo)
-makedepends=(valgrind git meson)
-_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2  # tags/1.17.4^0
-source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd cairo
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd cairo
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
-  arch-meson cairo build \
-    --libdir=/usr/lib32 \
-    -D spectre=disabled \
-    -D tee=enabled \
-    -D tests=disabled
-  meson compile -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-  rm -r "$pkgdir"/usr/{include,bin}
-}

Copied: lib32-cairo/repos/multilib-x86_64/PKGBUILD (from rev 769979, lib32-cairo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-12-04 12:29:44 UTC (rev 769980)
@@ -0,0 +1,50 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=lib32-cairo
+pkgver=1.17.4
+pkgrel=2
+pkgdesc="2D graphics library with support for multiple output devices (32-bit)"
+url="https://cairographics.org/"
+arch=(x86_64)
+license=(LGPL MPL)
+depends=(lib32-zlib lib32-libpng lib32-fontconfig lib32-freetype2 lib32-libx11
+         lib32-libxext lib32-libxrender lib32-libxcb lib32-glib2 lib32-pixman
+         cairo)
+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() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+  arch-meson cairo build \
+    --libdir=/usr/lib32 \
+    -D spectre=disabled \
+    -D tee=enabled \
+    -D tests=disabled
+  meson compile -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+  rm -r "$pkgdir"/usr/{include,bin}
+}

Copied: lib32-cairo/repos/multilib-x86_64/xlib-xcb.diff (from rev 769979, lib32-cairo/trunk/xlib-xcb.diff)
===================================================================
--- xlib-xcb.diff	                        (rev 0)
+++ xlib-xcb.diff	2020-12-04 12:29:44 UTC (rev 769980)
@@ -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
+