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

[Jan Steffens via arch-commits]

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
===
--- PKGBUILD2020-12-04 12:29:06 UTC (rev 769979)
+++ PKGBUILD2020-12-04 12:29:44 UTC (rev 769980)
@@ -1,44 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Ionut Biru 
-
-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)
+++ PKGBUILD2020-12-04 12:29:44 UTC (rev 769980)
@@ -0,0 +1,50 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Ionut Biru 
+
+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
+ 

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

[Jan Steffens via arch-commits]

Date: Friday, September 21, 2018 @ 18:14:23
  Author: heftig
Revision: 383865

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD
(from rev 383864, lib32-cairo/trunk/PKGBUILD)
Deleted:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD
  lib32-cairo/repos/multilib-x86_64/utf-8.diff

+
 PKGBUILD   |  139 ---
 utf-8.diff |   44 --
 2 files changed, 66 insertions(+), 117 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2018-09-21 18:14:02 UTC (rev 383864)
+++ PKGBUILD2018-09-21 18:14:23 UTC (rev 383865)
@@ -1,73 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru 
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.15.12
-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-libpng lib32-libxrender lib32-libxext lib32-fontconfig 
lib32-pixman lib32-glib2 $_pkgbasename)
-makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
-_commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519  # tags/1.15.12^0
-source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit;
-utf-8.diff)
-sha1sums=('SKIP'
-  '3f680dea8533bcce4ca2af5d25c546235ef7b339')
-
-pkgver() {
-  cd $_pkgbasename
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $_pkgbasename
-
-  # Fixup tag for pkgver()
-  git tag -f 1.15.10 5e6b9aeb5e3402ff17ae8ee8548ae2341c2f7d59
-
-  # Fix non-UTF-8 sources giving gtk-doc trouble
-  patch -Np1 -i ../utf-8.diff
-
-  # 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
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $_pkgbasename
-  ./configure --prefix=/usr \
---libdir=/usr/lib32 \
---sysconfdir=/etc \
---localstatedir=/var \
---disable-static \
---disable-gl \
---enable-tee \
---enable-svg \
---enable-ps \
---enable-pdf \
---enable-gobject \
---disable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd $_pkgbasename
-  # https://people.gnome.org/~federico/blog/helping-cairo.html
-  #make check
-}
-
-package() {
-  cd $_pkgbasename
-  make DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/usr/{include,share,bin}
-}

Copied: lib32-cairo/repos/multilib-x86_64/PKGBUILD (from rev 383864, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-09-21 18:14:23 UTC (rev 383865)
@@ -0,0 +1,66 @@
+# Contributor: Ionut Biru 
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.15.14
+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-libpng lib32-libxrender lib32-libxext lib32-fontconfig 
lib32-pixman lib32-glib2 $_pkgbasename)
+makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
+_commit=d9aaea0c1e1484c632e1a6735c6ecc961c4b032b  # tags/1.15.14^0
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;)
+sha1sums=('SKIP')
+
+pkgver() {
+  cd $_pkgbasename
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $_pkgbasename
+
+  # 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
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd $_pkgbasename
+  ./configure --prefix=/usr \
+--libdir=/usr/lib32 \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--disable-static \
+--disable-gl \
+--enable-tee \
+--enable-svg \
+--enable-ps \
+--enable-pdf \
+--enable-gobject \
+--disable-gtk-doc
+#--enable-full-testing \
+#--enable-test-surfaces
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd $_pkgbasename
+  # many tests in cairo-test-suite hang forever
+  # xvfb-run make check
+}
+
+package() {
+  cd $_pkgbasename
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/{include,bin}
+}

Deleted: utf-8.diff
===
--- utf-8.diff  2018-09-21 18:14:02 UTC (rev 383864)
+++ utf-8.diff  2018-09-21 18:14:23 UTC (rev 383865)
@@ -1,44 +0,0 @@
- src/cairo-quartz-image.h | 2 +-
- src/cairo-quartz.h   | 2 +-
- src/cairo-vg.h   | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff 

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

[Laurent Carlier]

Date: Tuesday, July 4, 2017 @ 08:44:06
  Author: lcarlier
Revision: 242283

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD
(from rev 242282, lib32-cairo/trunk/PKGBUILD)
Deleted:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD
  lib32-cairo/repos/multilib-x86_64/libpng16.patch

+
 PKGBUILD   |   88 +++
 libpng16.patch |   40 -
 2 files changed, 44 insertions(+), 84 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-07-04 08:43:49 UTC (rev 242282)
+++ PKGBUILD2017-07-04 08:44:06 UTC (rev 242283)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.14.6
-pkgrel=2
-pkgdesc="Cairo vector graphics library (32-bit)"
-arch=('x86_64')
-url="http://cairographics.org/;
-license=('LGPL' 'MPL')
-makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-librsvg')
-depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
- 'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl'
- ${_pkgbasename})
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
-options=(!libtool)
-sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-   
-  ./configure --prefix=/usr \
-  --libdir=/usr/lib32 \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --disable-static \
-  --enable-tee \
-  --enable-gl \
-  --enable-egl
-  # --disable-xlib-xcb
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}

Copied: lib32-cairo/repos/multilib-x86_64/PKGBUILD (from rev 242282, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-07-04 08:44:06 UTC (rev 242283)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru 
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.14.10
+pkgrel=1
+pkgdesc="Cairo vector graphics library (32-bit)"
+arch=('x86_64')
+url="https://cairographics.org/;
+license=('LGPL' 'MPL')
+makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-librsvg')
+depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
+ 'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl'
+ ${_pkgbasename})
+source=(https://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
+options=(!libtool)
+sha1sums=('28c59d85d6b790c21b8b59ece73a6a1dda28d69a')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+   
+  ./configure --prefix=/usr \
+  --libdir=/usr/lib32 \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-static \
+  --enable-tee \
+  --enable-gl \
+  --enable-egl
+  # --disable-xlib-xcb
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+}

Deleted: libpng16.patch
===
--- libpng16.patch  2017-07-04 08:43:49 UTC (rev 242282)
+++ libpng16.patch  2017-07-04 08:44:06 UTC (rev 242283)
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson 
-Date: Tue, 16 Apr 2013 09:58:56 +
-Subject: png: Avoid marking the surface as in error after a png warning
-
-It turns out that libpng will continue to load an image after throwing a
-warning, and that libpng16 now throws warnings for images that libpng15
-and earlier loaded without error. As we were happily loading those
-images into cairo surfaces before, we are therefore being overzealous
-in throwing an error now - so just squelch the warning.
-
-Signed-off-by: Chris Wilson 

-diff --git a/src/cairo-png.c b/src/cairo-png.c
-index e74a4a8..068617d 100644
 a/src/cairo-png.c
-+++ b/src/cairo-png.c
-@@ -149,13 +149,13 @@ static void
- png_simple_warning_callback (png_structp png,
-png_const_charp error_msg)
- {
--cairo_status_t *error = png_get_error_ptr (png);
--
--/* default to the most likely error */
--if (*error == CAIRO_STATUS_SUCCESS)
--  *error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--/* png does not expect to abort and will try to tidy up after a warning */
-+/* png does not expect to abort and will try to tidy up and continue
-+ * loading the image after a warning. So we