Update gdk-pixbuf2* to 2.32.1:

2.32.1
======

* Make relocations optional
* Fix a crash due to overflow when scaling
* Drop loaders for some rare image formats: wbmp, ras, pcx
* Prevent testsuite failures due to lack of memory
* Translation updates

2.32.0
======

* Fix build issues (#754154)
* Fix animation loading (#755269)
* More overflow fixes in the scaling code (#754387)
* Fix a crash in the tga loader
* Translation updates: Swedish, Turkish, Slovak,
  Indonesian, French, Greek, Polish, Brazilian Portuguese,
  Danish, Russian, Galician, Hungarian

2.31.7
======

* Fix several integer overflows (#753908, #753569)
* Fix build failure with --disable-modules (#740912)
* Port animations to GTask
* Translation updates: Chinese (Taiwan), Polish

2.31.6
======

* Really fix bug 752297. This is CVE-2015-4491
* Translation updates: Catalan

2.31.5
======

* Add support for g_autoptr for all object types (#750497)
* Avoid a possible divide-by-zero in the pixbuf loader (750440)
* Remove gettext .pot file hack (#743574)
* Be more careful about integer overflow (#752297)
* Translation upates: Portuguese

2.31.4
======

* Bug fixes:
 648815 SVGZ icons in notification GNOME3
 725582 gdk_pixbuf_apply_embedded_orientation is not working...

* Translation updates:
 Bosnian, Danish, Italian, Kazakh, Korean, Swedish

2.31.3
======

* API changes:
- Revert an annotation change that broke bindings

* Build fixes:
- Clean up configure
- Fix Visual Studio build
- Define MAP_ANONYMOUS when needed
- Include gi18n-lib.h where needed

* Translation updates:
 Hungarian, German, Indonesian, Turkish, Serbian, Slovenian,
 Basque, Russian, Icelandic, French, Chinese (Taiwan), Galician,
 Slovak

2.31.2
======

* API changes:
- Deprecate GdkPixdata
- Add gdk_pixbuf_get_options() helper to list set options
- Annotations fixes for various functions
- Remove incorrect info about area-prepared signal

* Image format support changes
- Flag multi-page TIFF files
- Fix memory usage for GIF animations, add note about minimum frame length
- Return an error for truncated PNG files
- Add density (DPI) support for JPEG, PNG and TIFF
- Fix reading CMYK JPEG files generated by Photoshop
- Allow saving 1-bit mono TIFF files as used in faxes
- Simplify loader names
- Fix loading GIF files when the first write is short
- Add progressive loading to ICNS files
- Add support for 256x256 ICO files
- Fix reading MS AMCap2 BMP files

* Other:
- Honour requested depth in Xlib
- Special-case compositing/copying with no scaling
- Add relocation support to OSX and Linux
- Prefer gdk-pixbuf's loaders to the GDI+ ones on Windows

2.31.1
======

* Add gdk_pixbuf_get_file_info_async

* Translation updates

2.31.0
======

* To improve the situation for language bindings, pixbufs can now
  be constructed from data in GBytes, and pixbuf data can also be
  extracted in this form. The GBytes data is treated as readonly,
  and gdk_pixbuf_get_pixels() will create a copy. To avoid this
  copy, a new function gdk_pixbuf_read_pixels() was introduced
  which returns a const pointer to the data without copying.

5 files changed, 11 insertions, 96 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 4888a4bfddb..0991cad58fe 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2015/08/31 12:35:52 he Exp $
+# $NetBSD: Makefile,v 1.30 2015/10/01 15:53:48 wiz Exp $
 
 DISTNAME=	gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=	${DISTNAME:S/pixbuf/pixbuf2/}
-PKGREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/graphics/gdk-pixbuf2/Makefile.version b/graphics/gdk-pixbuf2/Makefile.version
index 19813e79529..af1147dbf4d 100644
--- a/graphics/gdk-pixbuf2/Makefile.version
+++ b/graphics/gdk-pixbuf2/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.9 2015/06/30 10:47:55 ryoon Exp $
+# $NetBSD: Makefile.version,v 1.10 2015/10/01 15:53:48 wiz Exp $
 
-PIXBUF2_VERSION=	2.30.8
+PIXBUF2_VERSION=	2.32.1
 MSITE_VERSION=		${PIXBUF2_VERSION:R}
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index 6140534d7bb..78a98a8152b 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2014/01/12 00:24:01 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/10/01 15:53:48 wiz Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h
@@ -19,14 +20,11 @@ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
 lib/girepository-1.0/GdkPixbuf-2.0.typelib
@@ -43,6 +41,7 @@ share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-26.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-28.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-30.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-32.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html
@@ -71,7 +70,6 @@ share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2
 share/gtk-doc/html/gdk-pixbuf/home.png
 share/gtk-doc/html/gdk-pixbuf/index.html
-share/gtk-doc/html/gdk-pixbuf/index.sgml
 share/gtk-doc/html/gdk-pixbuf/left-insensitive.png
 share/gtk-doc/html/gdk-pixbuf/left.png
 share/gtk-doc/html/gdk-pixbuf/license.html
@@ -130,6 +128,7 @@ share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/kk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/km/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index c1148c8cec7..b70c4808e00 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2015/08/31 12:35:52 he Exp $
+$NetBSD: distinfo,v 1.26 2015/10/01 15:53:48 wiz Exp $
 
-SHA1 (gdk-pixbuf-2.30.8.tar.xz) = 6277b4e5b5e334b3669f15ae0376e184be9e8cd8
-RMD160 (gdk-pixbuf-2.30.8.tar.xz) = d9020436326e50f5f97e0c2a052d53eefb5e9356
-Size (gdk-pixbuf-2.30.8.tar.xz) = 1336788 bytes
+SHA1 (gdk-pixbuf-2.32.1.tar.xz) = 40482f165f3fc587e54a08bb9212aeca97e2d07d
+RMD160 (gdk-pixbuf-2.32.1.tar.xz) = e78b300ef06e0a1df35d5f9b4eaa0efda3e135aa
+Size (gdk-pixbuf-2.32.1.tar.xz) = 2427908 bytes
 SHA1 (patch-ab) = a64a1c9a4dd4c51d918e3409d40d76fd63146150
 SHA1 (patch-ac) = c55b59e380cf58ae7e94c760dc0dbb32b6b5fb69
 SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_pixops_pixops.c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_pixops_pixops.c
deleted file mode 100644
index 0a88ff25e6b..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_pixops_pixops.c
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-gdk-pixbuf_pixops_pixops.c,v 1.1 2015/08/31 12:35:53 he Exp $
-
-Add fix for https://bugzilla.gnome.org/show_bug.cgi?id=752297,
-also CVE-2015-4491, lifted from
-
-  https://git.gnome.org/browse/gdk-pixbuf/commit/gdk-pixbuf/pixops/pixops.c?id=ffec86ed5010c5a2be14f47b33bcf4ed3169a199
-and
-  https://git.gnome.org/browse/gdk-pixbuf/commit/?id=8dba67cb4f38d62a47757741ad41e3f245b4a32a
-
-Our loader code is supposed to handle out-of-memory and overflow
-situations gracefully, reporting errors instead of aborting. But
-if you load an image at a specific size, we also execute our
-scaling code, which was not careful enough about overflow in some
-places.
-
-This commit makes the scaling code silently return if it fails to
-allocate filter tables. This is the best we can do, since
-gdk_pixbuf_scale() is not taking a GError.
-
---- gdk-pixbuf/pixops/pixops.c.orig	2014-03-06 04:36:45.000000000 +0000
-+++ gdk-pixbuf/pixops/pixops.c
-@@ -1192,7 +1192,20 @@ make_filter_table (PixopsFilter *filter)
-   int i_offset, j_offset;
-   int n_x = filter->x.n;
-   int n_y = filter->y.n;
--  int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
-+  gsize n_weights;
-+  int *weights;
-+
-+  n_weights = SUBSAMPLE * SUBSAMPLE * n_x;
-+  if (n_weights / (SUBSAMPLE * SUBSAMPLE) != n_x)
-+    return NULL; /* overflow, bail */
-+
-+  n_weights *= n_y;
-+  if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
-+    return NULL; /* overflow, bail */
-+
-+  weights = g_try_new (int, n_weights);
-+  if (!weights)
-+    return NULL; /* overflow, bail */
- 
-   for (i_offset=0; i_offset < SUBSAMPLE; i_offset++)
-     for (j_offset=0; j_offset < SUBSAMPLE; j_offset++)
-@@ -1267,8 +1280,11 @@ pixops_process (guchar         *dest_buf
-   if (x_step == 0 || y_step == 0)
-     return; /* overflow, bail out */
- 
--  line_bufs = g_new (guchar *, filter->y.n);
-   filter_weights = make_filter_table (filter);
-+  if (!filter_weights)
-+    return; /* overflow, bail out */
-+
-+  line_bufs = g_new (guchar *, filter->y.n);
- 
-   check_shift = check_size ? get_check_shift (check_size) : 0;
- 
-@@ -1388,7 +1404,7 @@ tile_make_weights (PixopsFilterDimension
- 		   double                 scale)
- {
-   int n = ceil (1 / scale + 1);
--  double *pixel_weights = g_new (double, SUBSAMPLE * n);
-+  double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
-   int offset;
-   int i;
- 
-@@ -1446,7 +1462,7 @@ bilinear_magnify_make_weights (PixopsFil
-     }
- 
-   dim->n = n;
--  dim->weights = g_new (double, SUBSAMPLE * n);
-+  dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
- 
-   pixel_weights = dim->weights;
- 
-@@ -1537,7 +1553,7 @@ bilinear_box_make_weights (PixopsFilterD
- 			   double                 scale)
- {
-   int n = ceil (1/scale + 3.0);
--  double *pixel_weights = g_new (double, SUBSAMPLE * n);
-+  double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
-   double w;
-   int offset, i;
-