pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics 2.36.8:
details: https://anonhg.NetBSD.org/pkgsrc/rev/567986abbf1f
branches: trunk
changeset: 366267:567986abbf1f
user: adam <adam%pkgsrc.org@localhost>
date: Tue Aug 08 16:52:10 2017 +0000
description:
2.36.8:
* jpeg: restore grayscale image support
* bmp: Tighten image dimension checks
* ico: Fixo icon quality sorting
* Various other leak and overflow fixes
* Add some assertion to help static analysis
* Remove support for building on various obsolete platforms
* Translation updates
2.36.7:
* Add tests for recent bug fixes
* ico, bmp, tiff: avoid integer overflows
* jpeg: error out if wrong number of channels
* Misc.bugfixes
* Support mimetypes: image/wmf, image/emf
* Translation updates
diffstat:
graphics/gdk-pixbuf2-jasper/Makefile | 11 ++-
graphics/gdk-pixbuf2-xlib/Makefile | 14 +++--
graphics/gdk-pixbuf2/Makefile | 10 ++--
graphics/gdk-pixbuf2/Makefile.version | 4 +-
graphics/gdk-pixbuf2/distinfo | 14 ++--
graphics/gdk-pixbuf2/patches/patch-configure | 14 +++++
graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c | 12 ++--
graphics/gdk-pixbuf2/patches/patch-thumbnailer_gnome-thumbnailer-skeleton.c | 24 ----------
8 files changed, 49 insertions(+), 54 deletions(-)
diffs (214 lines):
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2-jasper/Makefile
--- a/graphics/gdk-pixbuf2-jasper/Makefile Tue Aug 08 16:39:11 2017 +0000
+++ b/graphics/gdk-pixbuf2-jasper/Makefile Tue Aug 08 16:52:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/10/01 15:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/08/08 16:52:11 adam Exp $
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
PKGNAME= gdk-pixbuf2-jasper-${PIXBUF2_VERSION}
@@ -16,11 +16,13 @@
.include "../../graphics/gdk-pixbuf2/Makefile.version"
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-libtiff --without-libjpeg --without-libpng
-CONFIGURE_ARGS+= --with-libjasper
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-libjasper
+CONFIGURE_ARGS+= --without-libjpeg
+CONFIGURE_ARGS+= --without-libpng
+CONFIGURE_ARGS+= --without-libtiff
BUILD_DIRS= gdk-pixbuf
BUILD_TARGET= libpixbufloader-jasper.la
@@ -34,6 +36,7 @@
.include "../../graphics/gdk-pixbuf2/loaders.mk"
+.include "../../databases/shared-mime-info/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2-xlib/Makefile
--- a/graphics/gdk-pixbuf2-xlib/Makefile Tue Aug 08 16:39:11 2017 +0000
+++ b/graphics/gdk-pixbuf2-xlib/Makefile Tue Aug 08 16:52:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/07/30 22:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/08 16:52:11 adam Exp $
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
PKGNAME= gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
@@ -20,16 +20,18 @@
.include "../../graphics/gdk-pixbuf2/Makefile.version"
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-libtiff --without-libjpeg --without-libpng
+CONFIGURE_ARGS+= --without-libjpeg
+CONFIGURE_ARGS+= --without-libpng
+CONFIGURE_ARGS+= --without-libtiff
CONFIGURE_ARGS+= --with-x11
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-USE_PKGLOCALEDIR= yes
-
PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
+.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../devel/glib2/buildlink3.mk"
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2/Makefile
--- a/graphics/gdk-pixbuf2/Makefile Tue Aug 08 16:39:11 2017 +0000
+++ b/graphics/gdk-pixbuf2/Makefile Tue Aug 08 16:52:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/10/09 17:49:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2017/08/08 16:52:10 adam Exp $
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
PKGNAME= ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -15,11 +15,10 @@
.include "../../graphics/gdk-pixbuf2/Makefile.version"
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config gmake
-USE_PKGLOCALEDIR= yes
-
PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
@@ -32,6 +31,7 @@
post-install:
${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
+.include "../../databases/shared-mime-info/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPMETHOD.gobject-introspection:= build
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2/Makefile.version
--- a/graphics/gdk-pixbuf2/Makefile.version Tue Aug 08 16:39:11 2017 +0000
+++ b/graphics/gdk-pixbuf2/Makefile.version Tue Aug 08 16:52:10 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.version,v 1.16 2017/05/14 12:55:16 spz Exp $
+# $NetBSD: Makefile.version,v 1.17 2017/08/08 16:52:10 adam 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.6
+PIXBUF2_VERSION= 2.36.8
MSITE_VERSION= ${PIXBUF2_VERSION:R}
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2/distinfo
--- a/graphics/gdk-pixbuf2/distinfo Tue Aug 08 16:39:11 2017 +0000
+++ b/graphics/gdk-pixbuf2/distinfo Tue Aug 08 16:52:10 2017 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.33 2017/05/14 12:55:16 spz Exp $
+$NetBSD: distinfo,v 1.34 2017/08/08 16:52:10 adam Exp $
-SHA1 (gdk-pixbuf-2.36.6.tar.xz) = 8caa99dbbb143cddbb896bf35e01da717bb1479f
-RMD160 (gdk-pixbuf-2.36.6.tar.xz) = 9894ee0a16ed9fd6e7a152c1a5c2636985430d3a
-SHA512 (gdk-pixbuf-2.36.6.tar.xz) = b963f01161b58463c83499079545aa946fd824ec5e7167e0898698ac46e0cc3fb3dcb0cac5afabd6b7d957391b9c9bba55f340294076433155fc91052d5403ec
-Size (gdk-pixbuf-2.36.6.tar.xz) = 5166980 bytes
+SHA1 (gdk-pixbuf-2.36.8.tar.xz) = f68129cceffa0e48bfc0be3b812d276f9c6dae89
+RMD160 (gdk-pixbuf-2.36.8.tar.xz) = 6a5d6729d62d9e3b1c4321f5f916e42f142d3f4a
+SHA512 (gdk-pixbuf-2.36.8.tar.xz) = db92770098eff80706aad6fcd4ad6709aa6e4643d8740fc49dc0bb0620f94ff1b3df5d9ff65e7b27b060f36119ae654a0358fd40118f75b205f751a870bae052
+Size (gdk-pixbuf-2.36.8.tar.xz) = 5769164 bytes
+SHA1 (patch-configure) = 1207c64836c0f5a79d32c19a97b6f539af136d45
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
SHA1 (patch-gdk-pixbuf_io-icns.c) = 71c1aa8ab88a260086b2bb345094d6a4376319a4
-SHA1 (patch-gdk-pixbuf_io-ico.c) = b9899618924d8201f3577d4d010e9c00be1c5d3b
+SHA1 (patch-gdk-pixbuf_io-ico.c) = 182c1e599259d6a043612abbad69a9527fa969e9
SHA1 (patch-gdk-pixbuf_io-tiff.c) = a43137f861ff9a240d148adb2a278c2112291652
-SHA1 (patch-thumbnailer_gnome-thumbnailer-skeleton.c) = ea0f9dd8fa79f3eb794873745ea3b132e157e176
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gdk-pixbuf2/patches/patch-configure Tue Aug 08 16:52:10 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2017/08/08 16:52:10 adam Exp $
+
+Fix libtiff detection.
+
+--- configure.orig 2017-08-08 16:46:18.000000000 +0000
++++ configure
+@@ -18796,6 +18796,7 @@ $as_echo "yes" >&6; }
+
+ fi
+ libtiff_found=yes
++ LIBTIFF=-ltiff
+ fi
+
+ if test x$with_libtiff != xno && test x$libtiff_found = xno; then
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c Tue Aug 08 16:39:11 2017 +0000
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c Tue Aug 08 16:52:10 2017 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-gdk-pixbuf_io-ico.c,v 1.1 2017/05/14 12:55:16 spz Exp $
+$NetBSD: patch-gdk-pixbuf_io-ico.c,v 1.2 2017/08/08 16:52:10 adam Exp $
from https://bugzilla.gnome.org/attachment.cgi?id=347366&action=diff
for CVE-2017-6312
---- gdk-pixbuf/io-ico.c.orig 2017-02-27 17:24:19.000000000 +0000
+--- gdk-pixbuf/io-ico.c.orig 2017-08-07 16:52:44.000000000 +0000
+++ gdk-pixbuf/io-ico.c
-@@ -330,10 +330,8 @@ static void DecodeHeader(guchar *Data, g
- return;
- }
+@@ -333,10 +333,8 @@ static void DecodeHeader(guchar *Data, g
+ for (l = State->entries; l != NULL; l = g_list_next (l)) {
+ entry = l->data;
- /* We know how many bytes are in the "header" part. */
- State->HeaderSize = entry->DIBoffset + INFOHEADER_SIZE;
@@ -18,7 +18,7 @@
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-@@ -341,6 +339,9 @@ static void DecodeHeader(guchar *Data, g
+@@ -344,6 +342,9 @@ static void DecodeHeader(guchar *Data, g
return;
}
diff -r 9d6e56b9862e -r 567986abbf1f graphics/gdk-pixbuf2/patches/patch-thumbnailer_gnome-thumbnailer-skeleton.c
--- a/graphics/gdk-pixbuf2/patches/patch-thumbnailer_gnome-thumbnailer-skeleton.c Tue Aug 08 16:39:11 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-thumbnailer_gnome-thumbnailer-skeleton.c,v 1.1 2017/05/14 12:55:16 spz Exp $
-
-from https://bug778204.bugzilla-attachments.gnome.org/attachment.cgi?id=349903
-for CVE-2017-6311
-
---- thumbnailer/gnome-thumbnailer-skeleton.c.orig 2017-02-13 15:58:32.000000000 +0000
-+++ thumbnailer/gnome-thumbnailer-skeleton.c
-@@ -315,11 +315,15 @@ int main (int argc, char **argv)
- #endif
- g_free (input_filename);
-
-- if (!pixbuf) {
-+ if (!pixbuf && error) {
- g_warning ("Could not thumbnail '%s': %s", filenames[0], error->message);
- g_error_free (error);
- g_strfreev (filenames);
- return 1;
-+ } else if (!pixbuf) {
-+ g_warning ("Could not thumbnail '%s'", filenames[0]);
-+ g_strfreev (filenames);
-+ return 1;
- }
-
- if (gdk_pixbuf_save (pixbuf, output, "png", &error, NULL) == FALSE) {
Home |
Main Index |
Thread Index |
Old Index