CVS commit: pkgsrc/graphics/gdk-pixbuf2

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Jan 29 06:09:51 UTC 2017

Modified Files:
        pkgsrc/graphics/gdk-pixbuf2: Makefile.version PLIST distinfo
Added Files:
        pkgsrc/graphics/gdk-pixbuf2/patches:
            patch-contrib_gdk-pixbuf-xlib_Makefile.in
            patch-gdk-pixbuf_Makefile.in
Removed Files:
        pkgsrc/graphics/gdk-pixbuf2/patches: patch-ab patch-ac

Log Message:
Update gdk-pixbuf2 to 2.36.4.

This also updates gdk-pixbuf2-jasper and gdk-pixbuf2-xlib to 2.36.4
via common Makefile.version.

pkgsrc changes:
 * Regen old style name patches for future maintainability

Upstream changes (from NEWS):

2.36.4
======

* Add a fastpath for no-op scales
* Documentation improvements (#442452)
* Fix some coverity warnings (#776945, #768062)
* Translation updates

2.36.3
======

* gif, ico: Fix area-updated coordinates (#581484)
* tga: Improve error handling (#575217)
* jasper: Improve error handling (#685543)
* Test suite improvements (#696331)
* Minor documentation fixes (#776457)
* Translation updates

2.36.2
======

* Fix a NULL pointer dereference (#776026)
* Fix a memory leak (#776020)
* Support bmp headers with bitmask (#766890)
* Add tests for scaling (#80925)
* Handle compressed pixdata in resources (#776105)
* Avoid a buffer overrun in the qtif loader ($#775648)
* Fix a crash in the bmp loader (#775242)
* Fix crash opening pnm images with large dimensions (#775232)
* Prevent buffer overflow in the pixdata loader (#775693)
* Translation updates

2.36.1
======

* Remove the pixdata loader (#776004)
* Fix integer overflows in the jpeg loader (#775218)
* Add an external thumbnailer for images
* Translation updates


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/gdk-pixbuf2/Makefile.version \
    pkgsrc/graphics/gdk-pixbuf2/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/gdk-pixbuf2/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/gdk-pixbuf2/patches/patch-ab
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/gdk-pixbuf2/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gdk-pixbuf2/Makefile.version
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile.version:1.14 pkgsrc/graphics/gdk-pixbuf2/Makefile.version:1.15
--- pkgsrc/graphics/gdk-pixbuf2/Makefile.version:1.14   Sun Oct  9 17:53:31 2016
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile.version        Sun Jan 29 06:09:51 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.version,v 1.14 2016/10/09 17:53:31 ryoon Exp $
+# $NetBSD: Makefile.version,v 1.15 2017/01/29 06:09:51 tsutsui Exp $
 #
 # used by graphics/gdk-pixbuf2/Makefile
 # used by graphics/gdk-pixbuf2-jasper/Makefile
 # used by graphics/gdk-pixbuf2-xlib/Makefile
 
-PIXBUF2_VERSION=       2.36.0
+PIXBUF2_VERSION=       2.36.4
 MSITE_VERSION=         ${PIXBUF2_VERSION:R}
Index: pkgsrc/graphics/gdk-pixbuf2/PLIST
diff -u pkgsrc/graphics/gdk-pixbuf2/PLIST:1.14 pkgsrc/graphics/gdk-pixbuf2/PLIST:1.15
--- pkgsrc/graphics/gdk-pixbuf2/PLIST:1.14      Sun Oct  9 17:49:38 2016
+++ pkgsrc/graphics/gdk-pixbuf2/PLIST   Sun Jan 29 06:09:51 2017
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.14 2016/10/09 17:49:38 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2017/01/29 06:09:51 tsutsui Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
+bin/gdk-pixbuf-thumbnailer
 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
@@ -115,6 +116,7 @@ share/locale/eu/LC_MESSAGES/gdk-pixbuf.m
 share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fur/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
@@ -187,3 +189,4 @@ share/locale/yi/LC_MESSAGES/gdk-pixbuf.m
 share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
+share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer

Index: pkgsrc/graphics/gdk-pixbuf2/distinfo
diff -u pkgsrc/graphics/gdk-pixbuf2/distinfo:1.31 pkgsrc/graphics/gdk-pixbuf2/distinfo:1.32
--- pkgsrc/graphics/gdk-pixbuf2/distinfo:1.31   Sun Oct  9 17:49:38 2016
+++ pkgsrc/graphics/gdk-pixbuf2/distinfo        Sun Jan 29 06:09:51 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.31 2016/10/09 17:49:38 ryoon Exp $
+$NetBSD: distinfo,v 1.32 2017/01/29 06:09:51 tsutsui Exp $
 
-SHA1 (gdk-pixbuf-2.36.0.tar.xz) = 39328ecec0ec61edf8530c76a1495ca0fa95f4cf
-RMD160 (gdk-pixbuf-2.36.0.tar.xz) = 0a6079ba5a018ff62aaeb0af699a1355c7500f5c
-SHA512 (gdk-pixbuf-2.36.0.tar.xz) = f9f5cc9aabf08bc246c7a328c9775a89eb1a6bf21699928c0e1fd17ac86e624162097d65ee9b51e550ee64dd201bea48465bff9636c94844d91a9cf3f73da919
-Size (gdk-pixbuf-2.36.0.tar.xz) = 2718648 bytes
-SHA1 (patch-ab) = a64a1c9a4dd4c51d918e3409d40d76fd63146150
-SHA1 (patch-ac) = c55b59e380cf58ae7e94c760dc0dbb32b6b5fb69
+SHA1 (gdk-pixbuf-2.36.4.tar.xz) = d511ec0244b74bd3591eda7ccefcf79123f17d9d
+RMD160 (gdk-pixbuf-2.36.4.tar.xz) = db3e3f36826e5c866867b1ecf76e45e9c5e2c675
+SHA512 (gdk-pixbuf-2.36.4.tar.xz) = 3cede681a980998f0ace1a53cbf6faf25c0766582196c84a2860f1db7b2f08e04ef60c2046483b1ca5f9025bc20859a93ad295fd34c56dedcc214356c6375466
+Size (gdk-pixbuf-2.36.4.tar.xz) = 5158812 bytes
+SHA1 (patch-contrib_gdk-pixbuf-xlib_Makefile.in) = 636ab94c6bfde10c118b7833b4637a586781bfd5
+SHA1 (patch-gdk-pixbuf_Makefile.in) = 9173c4dbc89e4a4d34359e52885121c19a8a7ba6
 SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda

Added files:

Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in:1.1
--- /dev/null   Sun Jan 29 06:09:51 2017
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in       Sun Jan 29 06:09:51 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-contrib_gdk-pixbuf-xlib_Makefile.in,v 1.1 2017/01/29 06:09:51 tsutsui Exp $
+
+* Adjust dependencies for pkgsrc/graphics/gdk-pixbuf2-xlib
+
+--- contrib/gdk-pixbuf-xlib/Makefile.in.orig   2017-01-16 18:32:24.000000000 +0000
++++ contrib/gdk-pixbuf-xlib/Makefile.in
+@@ -141,7 +141,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+       "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
++libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = \
+       $(am__DEPENDENCIES_1)
+ am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \
+       gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \
+@@ -439,7 +439,7 @@ libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
+       -version-info $(LT_VERSION_INFO)
+ 
+ libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+-        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
++        $(prefix)/lib/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
+       $(GDK_PIXBUF_XLIB_DEP_LIBS)
+ 
+ libgdk_pixbuf_xlib_2_0_la_SOURCES = \
Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in:1.1
--- /dev/null   Sun Jan 29 06:09:51 2017
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in    Sun Jan 29 06:09:51 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-gdk-pixbuf_Makefile.in,v 1.1 2017/01/29 06:09:51 tsutsui Exp $
+
+* Adjust dependencies for pkgsrc/graphics/gdk-pixbuf2-jasper
+
+--- gdk-pixbuf/Makefile.in.orig        2017-01-16 18:32:24.000000000 +0000
++++ gdk-pixbuf/Makefile.in
+@@ -394,8 +394,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
+       $(LDFLAGS) -o $@
+ @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \
+ @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@  $(loaderdir)
+-libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-      $(am__DEPENDENCIES_2)
++libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo
+ libpixbufloader_jasper_la_OBJECTS =  \
+       $(am_libpixbufloader_jasper_la_OBJECTS)
+@@ -1136,7 +1135,7 @@ libpixbufloader_icns_la_LIBADD = $(modul
+ libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
+ libpixbufloader_jasper_la_SOURCES = io-jasper.c
+ libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
+-libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
++libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(PREFIX)/lib/libgdk_pixbuf-2.0.la
+ 
+ #
+ # The QTIF loader