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

2020-12-17 Thread Jan Steffens via arch-commits 
Date: Thursday, December 17, 2020 @ 16:51:22
  Author: heftig
Revision: 02

archrelease: copy trunk to multilib-x86_64

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

---+
 PKGBUILD  |  104 +---
 xlib-xcb.diff |   50 +-
 2 files changed, 79 insertions(+), 75 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-12-17 16:51:17 UTC (rev 01)
+++ PKGBUILD2020-12-17 16:51:22 UTC (rev 02)
@@ -1,50 +0,0 @@
-# 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/PKGBUILD (from rev 01, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2020-12-17 16:51:22 UTC (rev 02)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Ionut Biru 
+
+pkgname=lib32-cairo
+pkgver=1.17.4
+pkgrel=3
+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
+
+  # Fix library versioning
+  # https://bugs.archlinux.org/task/69012
+  git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184
+
+  # 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}
+}

Deleted: xlib-xcb.diff
===
--- xlib-xcb.diff   2020-12-17 16:51:17 UTC (rev 01)
+++ xlib-xcb.diff   2020-12-17 16:51:22 UTC (rev 02)
@@ -1,25 +0,0 @@
-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',

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

2018-04-12 Thread Jan Steffens via arch-commits 
Date: Thursday, April 12, 2018 @ 09:27:47
  Author: heftig
Revision: 316034

archrelease: copy trunk to multilib-x86_64

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

+
 PKGBUILD   |  146 +--
 utf-8.diff |   88 +--
 2 files changed, 117 insertions(+), 117 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2018-04-12 09:27:25 UTC (rev 316033)
+++ PKGBUILD2018-04-12 09:27:47 UTC (rev 316034)
@@ -1,73 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru 
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.15.10+54+g1ed124ace
-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=1ed124ace201946177eab962d3b07bb2fedf9026  # master
-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 316033, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-04-12 09:27:47 UTC (rev 316034)
@@ -0,0 +1,73 @@
+# $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}
+}

Deleted:

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

2016-01-26 Thread Felix Yan 
Date: Wednesday, January 27, 2016 @ 03:40:19
  Author: fyan
Revision: 159004

archrelease: copy trunk to multilib-x86_64

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2016-01-27 02:39:59 UTC (rev 159003)
+++ PKGBUILD2016-01-27 02:40:19 UTC (rev 159004)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.14.6
-pkgrel=1
-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')
-depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
- 'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl' 
'lib32-librsvg'
- ${_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 159003, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2016-01-27 02:40:19 UTC (rev 159004)
@@ -0,0 +1,44 @@
+# $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}
+}

Deleted: libpng16.patch
===
--- libpng16.patch  2016-01-27 02:39:59 UTC (rev 159003)
+++ libpng16.patch  2016-01-27 02:40:19 UTC (rev 159004)
@@ -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

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

2015-12-15 Thread Felix Yan 
Date: Tuesday, December 15, 2015 @ 10:46:05
  Author: fyan
Revision: 153367

archrelease: copy trunk to multilib-x86_64

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2015-12-15 09:45:42 UTC (rev 153366)
+++ PKGBUILD2015-12-15 09:46:05 UTC (rev 153367)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.14.4
-pkgrel=1
-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')
-depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
- 'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl' 
'lib32-librsvg'
- ${_pkgbasename})
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
-options=(!libtool)
-sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9')
-
-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 153366, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-12-15 09:46:05 UTC (rev 153367)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru 
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.14.6
+pkgrel=1
+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')
+depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
+ 'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl' 
'lib32-librsvg'
+ ${_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}
+}

Deleted: libpng16.patch
===
--- libpng16.patch  2015-12-15 09:45:42 UTC (rev 153366)
+++ libpng16.patch  2015-12-15 09:46:05 UTC (rev 153367)
@@ -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

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

2015-11-03 Thread Felix Yan 
Date: Wednesday, November 4, 2015 @ 05:32:55
  Author: fyan
Revision: 145916

archrelease: copy trunk to multilib-x86_64

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

+
 PKGBUILD   |   87 +++
 libpng16.patch |   80 +-
 2 files changed, 84 insertions(+), 83 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-11-04 04:32:34 UTC (rev 145915)
+++ PKGBUILD2015-11-04 04:32:55 UTC (rev 145916)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.14.2
-pkgrel=1
-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')
-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=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24')
-
-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 145915, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-11-04 04:32:55 UTC (rev 145916)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru 
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.14.4
+pkgrel=1
+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')
+depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
+ 'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl' 
'lib32-librsvg'
+ ${_pkgbasename})
+source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
+options=(!libtool)
+sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9')
+
+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  2015-11-04 04:32:34 UTC (rev 145915)
+++ libpng16.patch  2015-11-04 04:32:55 UTC (rev 145916)
@@ -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

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

2014-10-20 Thread Florian Pritz 
Date: Monday, October 20, 2014 @ 09:11:44
  Author: bluewind
Revision: 121021

archrelease: copy trunk to multilib-x86_64

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

+
 PKGBUILD   |   86 +++
 libpng16.patch |   80 +--
 2 files changed, 83 insertions(+), 83 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-10-20 07:11:40 UTC (rev 121020)
+++ PKGBUILD2014-10-20 07:11:44 UTC (rev 121021)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.12.16
-pkgrel=1
-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')
-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=('4f6e337d5d3edd7ea79d1426f575331552b003ec')
-
-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 121020, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-10-20 07:11:44 UTC (rev 121021)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.14.0
+pkgrel=1
+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')
+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=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
+
+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  2014-10-20 07:11:40 UTC (rev 121020)
+++ libpng16.patch  2014-10-20 07:11:44 UTC (rev 121021)
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson ch...@chris-wilson.co.uk
-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 ch...@chris-wilson.co.uk

-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
-+