[arch-commits] Commit in lib32-cairo/repos/multilib-x86_64 (4 files)
Florian Pritz
bluewind at archlinux.org
Mon Oct 20 07:11:45 UTC 2014
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
===================================================================
--- PKGBUILD 2014-10-20 07:11:40 UTC (rev 121020)
+++ PKGBUILD 2014-10-20 07:11:44 UTC (rev 121021)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at 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)
+++ PKGBUILD 2014-10-20 07:11:44 UTC (rev 121021)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at 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 <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
Copied: lib32-cairo/repos/multilib-x86_64/libpng16.patch (from rev 121020, lib32-cairo/trunk/libpng16.patch)
===================================================================
--- libpng16.patch (rev 0)
+++ libpng16.patch 2014-10-20 07:11:44 UTC (rev 121021)
@@ -0,0 +1,40 @@
+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
More information about the arch-commits
mailing list