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

[Laurent Carlier]

    Date: Tuesday, July 4, 2017 @ 08:43:49
  Author: lcarlier
Revision: 242282

upgpkg: lib32-cairo 1.14.10-1

upstream update 1.14.10

Modified:
  lib32-cairo/trunk/PKGBUILD
Deleted:
  lib32-cairo/trunk/libpng16.patch

----------------+
 PKGBUILD       |   10 +++++-----
 libpng16.patch |   40 ----------------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-04 08:35:30 UTC (rev 242281)
+++ PKGBUILD	2017-07-04 08:43:49 UTC (rev 242282)
@@ -3,19 +3,19 @@
 
 _pkgbasename=cairo
 pkgname=lib32-$_pkgbasename
-pkgver=1.14.6
-pkgrel=2
+pkgver=1.14.10
+pkgrel=1
 pkgdesc="Cairo vector graphics library (32-bit)"
 arch=('x86_64')
-url="http://cairographics.org/"
+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=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
+source=(https://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
 options=(!libtool)
-sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5')
+sha1sums=('28c59d85d6b790c21b8b59ece73a6a1dda28d69a')
 
 build() {
   export CC="gcc -m32"

Deleted: libpng16.patch
===================================================================
--- libpng16.patch	2017-07-04 08:35:30 UTC (rev 242281)
+++ libpng16.patch	2017-07-04 08:43:49 UTC (rev 242282)
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue, 16 Apr 2013 09:58:56 +0000
-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 <chris at 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
-+     * loading the image after a warning. So we also want to return the
-+     * (incorrect?) surface.
-+     *
-+     * We use our own warning callback to squelch any attempts by libpng
-+     * to write to stderr as we may not be in control of that output.
-+     */
- }
- 
- 
---
-cgit v0.9.0.2-2-gbebe