pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics gdk-pixbuf2: update to 2.42.6, primarily to f...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbe719233679
branches:  trunk
changeset: 458644:cbe719233679
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Sep 19 08:06:20 2021 +0000

description:
gdk-pixbuf2: update to 2.42.6, primarily to fix CVE-2020-29385 and various
leaks.

Changes relevant to pkgsrc packaging:

- gdk-pixbuf2-xlib now uses a separate distfile.
- The jpeg and png loaders are no longer separate shared libraries.
- A fix for SunOS was upstreamed.

diffstat:

 graphics/gdk-pixbuf2-xlib/DESCR                                        |  21 +---
 graphics/gdk-pixbuf2-xlib/Makefile                                     |  48 ++-------
 graphics/gdk-pixbuf2-xlib/PLIST                                        |   4 +-
 graphics/gdk-pixbuf2-xlib/distinfo                                     |   6 +
 graphics/gdk-pixbuf2/Makefile                                          |  21 +---
 graphics/gdk-pixbuf2/Makefile.version                                  |   7 -
 graphics/gdk-pixbuf2/PLIST                                             |   6 +-
 graphics/gdk-pixbuf2/distinfo                                          |  15 +-
 graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c |   4 +-
 graphics/gdk-pixbuf2/patches/patch-meson.build                         |  17 ---
 graphics/gdk-pixbuf2/patches/patch-tests_meson.build                   |  36 +++---
 11 files changed, 55 insertions(+), 130 deletions(-)

diffs (truncated from 307 to 300 lines):

diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2-xlib/DESCR
--- a/graphics/gdk-pixbuf2-xlib/DESCR   Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2-xlib/DESCR   Sun Sep 19 08:06:20 2021 +0000
@@ -1,18 +1,5 @@
-  GdkPixbuf is a new GNOME library designed to solve part of Imlib's
-design limitations that make it hard to write efficient and highly
-modular applications.  The GdkPixbuf library provides a basic,
-reference counted structure called GdkPixbuf.  This structure points
-to a block of image data, has fields that describe the format of the
-image data, and also contains a reference count.  The library also
-provides a simple mechanism for loading images from files, and a more
-sophisticated mechanism for loading images progressively from
-arbitrary buffers.  It also provides utility functions to transform
-pixbufs and render them to GDK drawables.
+GdkPixbuf-Xlib contains the deprecated API for integrating GdkPixbuf with
+Xlib data types.
 
-The GdkPixBuf library provides a number of features:
-       * Image loading facilities.
-       * Rendering of a GdkPixBuf into various formats:
-         drawables (windows, pixmaps), GdkRGB buffers.
-
-This is the gtk 2 version of gdk-pixbuf.  It got
-included natively in gtk2+ and was split out again in revision 2.22.
+This library was originally shipped with gdk-pixbuf, and has since been
+moved out of the original repository.
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2-xlib/Makefile
--- a/graphics/gdk-pixbuf2-xlib/Makefile        Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2-xlib/Makefile        Sun Sep 19 08:06:20 2021 +0000
@@ -1,57 +1,29 @@
-# $NetBSD: Makefile,v 1.32 2021/04/16 07:35:28 nia Exp $
+# $NetBSD: Makefile,v 1.33 2021/09/19 08:06:20 nia Exp $
 
-DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
-PKGNAME=       gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
-PKGREVISION=   1
+DISTNAME=      gdk-pixbuf-xlib-2.40.2
+# historical reasons
+PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf-xlib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://developer.gnome.org/gdk-pixbuf
-COMMENT=       Image loaders for gtk2 (X11 support)
+HOMEPAGE=      https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
+COMMENT=       Deprecated Xlib integration for GdkPixbuf
 LICENSE=       gnu-gpl-v2
 
-PATCHDIR=      ${.CURDIR}/../../graphics/gdk-pixbuf2/patches
-DISTINFO_FILE= ${.CURDIR}/../../graphics/gdk-pixbuf2/distinfo
-
 CONFLICTS+=    gtk2+<2.22
 
-.include "../../graphics/gdk-pixbuf2/Makefile.version"
+USE_TOOLS+=    msgfmt pkg-config
+MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf-xlib
 
-USE_TOOLS+=    msgfmt pkg-config
-MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
-
-MESON_ARGS+=                   -D installed_tests=false
-MESON_ARGS+=                   -D man=false
-MESON_ARGS+=                   -D x11=true
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 PKGCONFIG_OVERRIDE=            output/meson-private/gdk-pixbuf-xlib-2.0.pc
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-post-install:
-       ${RM} -rf ${DESTDIR}${PREFIX}/*
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
-       ${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-       ${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-       ${INSTALL_LIB} ${WRKSRC}/output/contrib/gdk-pixbuf-xlib/*.so ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_LIB} ${WRKSRC}/output/contrib/gdk-pixbuf-xlib/*.so.*[0-9.] ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdk-pixbuf-xlib-2.0.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
-
 .include "../../devel/meson/build.mk"
-.include "../../databases/shared-mime-info/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection:=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2-xlib/PLIST
--- a/graphics/gdk-pixbuf2-xlib/PLIST   Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2-xlib/PLIST   Sun Sep 19 08:06:20 2021 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2019/11/06 13:52:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/09/19 08:06:20 nia Exp $
 include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.4000.0
+lib/libgdk_pixbuf_xlib-2.0.so.0.4000.2
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2-xlib/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gdk-pixbuf2-xlib/distinfo        Sun Sep 19 08:06:20 2021 +0000
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2021/09/19 08:06:20 nia Exp $
+
+SHA1 (gdk-pixbuf-xlib-2.40.2.tar.xz) = 46c7261de823a1fa40cebfc90a741383b3a75025
+RMD160 (gdk-pixbuf-xlib-2.40.2.tar.xz) = 9e510698d181bb7ee3851425d5254a52acdc08d1
+SHA512 (gdk-pixbuf-xlib-2.40.2.tar.xz) = 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37
+Size (gdk-pixbuf-xlib-2.40.2.tar.xz) = 53588 bytes
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/Makefile
--- a/graphics/gdk-pixbuf2/Makefile     Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2/Makefile     Sun Sep 19 08:06:20 2021 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2021/04/16 06:43:48 nia Exp $
+# $NetBSD: Makefile,v 1.48 2021/09/19 08:06:20 nia Exp $
 
-DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
+DISTNAME=      gdk-pixbuf-2.42.6
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
-PKGREVISION=   2
 CATEGORIES=    graphics gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -17,8 +16,6 @@
 
 CONFLICTS+=    gtk2+<2.22
 
-.include "../../graphics/gdk-pixbuf2/Makefile.version"
-
 USE_TOOLS+=    pkg-config xgettext
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
 
@@ -30,21 +27,11 @@
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_FOR_BUILD_ONLY=         tool
 
-.include "../../lang/python/pyversion.mk"
-
-REPLACE_INTERPRETER+=  py3
-REPLACE.py3.old=       .*/usr/bin/env python[^ ]*
-REPLACE.py3.new=       ${PYTHONBIN}
-REPLACE_FILES.py3+=    build-aux/gen-installed-test.py
-REPLACE_FILES.py3+=    build-aux/gen-thumbnailer.py
-REPLACE_FILES.py3+=    build-aux/gen-resources.py
+.include "../../lang/python/tool.mk"
 
 _BUILDING_GTK2= yes
 .include "loaders.mk"
 
-pre-build:
-       ${CHMOD} +x ${WRKSRC}/build-aux/*.py ${WRKSRC}/build-aux/*.sh
-
 .include "../../devel/meson/build.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/Makefile.version
--- a/graphics/gdk-pixbuf2/Makefile.version     Sun Sep 19 07:36:52 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.version,v 1.24 2019/11/06 13:52:51 wiz Exp $
-#
-# used by graphics/gdk-pixbuf2/Makefile
-# used by graphics/gdk-pixbuf2-xlib/Makefile
-
-PIXBUF2_VERSION=       2.40.0
-MSITE_VERSION=         ${PIXBUF2_VERSION:R}
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/PLIST
--- a/graphics/gdk-pixbuf2/PLIST        Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2/PLIST        Sun Sep 19 08:06:20 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2021/04/16 06:43:48 nia Exp $
+@comment $NetBSD: PLIST,v 1.21 2021/09/19 08:06:20 nia Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
@@ -21,8 +21,6 @@
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
@@ -33,7 +31,7 @@
 lib/girepository-1.0/GdkPixdata-2.0.typelib
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.4000.0
+lib/libgdk_pixbuf-2.0.so.0.4200.6
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 man/man1/gdk-pixbuf-csource.1
 man/man1/gdk-pixbuf-query-loaders.1
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/distinfo
--- a/graphics/gdk-pixbuf2/distinfo     Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2/distinfo     Sun Sep 19 08:06:20 2021 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.46 2020/02/20 03:35:35 brook Exp $
+$NetBSD: distinfo,v 1.47 2021/09/19 08:06:20 nia Exp $
 
-SHA1 (gdk-pixbuf-2.40.0.tar.xz) = 9396bd89c4647d8db2d02ef93c20c17dbce359d8
-RMD160 (gdk-pixbuf-2.40.0.tar.xz) = 409fc37578fbf1dea2abaefa715f74280b3ea0ab
-SHA512 (gdk-pixbuf-2.40.0.tar.xz) = 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
-Size (gdk-pixbuf-2.40.0.tar.xz) = 5512160 bytes
-SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda
+SHA1 (gdk-pixbuf-2.42.6.tar.xz) = 320ed10a4cb74a0770de91a9e5741767ebdef2bf
+RMD160 (gdk-pixbuf-2.42.6.tar.xz) = 9e01426ea380fa2ed6dd34410b8207a034792fb0
+SHA512 (gdk-pixbuf-2.42.6.tar.xz) = 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d
+Size (gdk-pixbuf-2.42.6.tar.xz) = 7708484 bytes
+SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = a9d2436711b1a1c3bb58beef0df5e485ad6cbe7d
 SHA1 (patch-gdk-pixbuf_meson.build) = 58b53744e4cc846ddc9492b86d8964c6c19ed5e2
-SHA1 (patch-meson.build) = e98fcafc3a123e4af8f26ba93c3a21af5fa37e2b
-SHA1 (patch-tests_meson.build) = 743abfb1d4e505882c4d304fc33ad60a3821e584
+SHA1 (patch-tests_meson.build) = 942b0dcfbc87ee335fb871a3d8811b5bade0c436
 SHA1 (patch-thumbnailer_meson.build) = fb9b7523663ac595ef66c8cf41837a733ac44216
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c    Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c    Sun Sep 19 08:06:20 2021 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c,v 1.2 2015/06/30 10:47:55 ryoon Exp $
+$NetBSD: patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c,v 1.3 2021/09/19 08:06:20 nia Exp $
 
 * include config.h early to avoid redefinition warnings on solaris
-*
+
 --- gdk-pixbuf/gdk-pixbuf-scaled-anim.c.orig   2014-03-06 04:36:45.000000000 +0000
 +++ gdk-pixbuf/gdk-pixbuf-scaled-anim.c
 @@ -19,7 +19,7 @@
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/patches/patch-meson.build
--- a/graphics/gdk-pixbuf2/patches/patch-meson.build    Sun Sep 19 07:36:52 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-meson.build,v 1.3 2019/07/29 19:40:51 jperkin Exp $
-
--D_XOPEN_SOURCE=1 implies POSIX.1 but we need at least 500 (SUSv2) for
-struct timeval. Fixes build on SunOS.
-https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues/128
-
---- meson.build.orig   2019-02-28 16:22:57.000000000 +0000
-+++ meson.build
-@@ -8,7 +8,7 @@ project('gdk-pixbuf', 'c',
-         ],
-         meson_version: '>= 0.46.0')
- 
--add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-D_XOPEN_SOURCE' ], language: 'c')
-+add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-D_XOPEN_SOURCE=600' ], language: 'c')
- 
- cc = meson.get_compiler('c')
- host_system = host_machine.system()
diff -r 693af70a495d -r cbe719233679 graphics/gdk-pixbuf2/patches/patch-tests_meson.build
--- a/graphics/gdk-pixbuf2/patches/patch-tests_meson.build      Sun Sep 19 07:36:52 2021 +0000
+++ b/graphics/gdk-pixbuf2/patches/patch-tests_meson.build      Sun Sep 19 08:06:20 2021 +0000
@@ -1,22 +1,22 @@
-$NetBSD: patch-tests_meson.build,v 1.1 2020/02/20 03:35:35 brook Exp $
+$NetBSD: patch-tests_meson.build,v 1.2 2021/09/19 08:06:20 nia Exp $
 
 Add LD_LIBRARY_PATH so uninstalled programs find newly built shared libraries.
 
---- tests/meson.build.orig     2019-10-08 10:44:10.000000000 +0000
+--- tests/meson.build.orig     2021-04-09 14:44:51.540196000 +0000
 +++ tests/meson.build
-@@ -5,6 +5,7 @@ resources_c = custom_target('resources.c
-   input: 'resources.gresource.xml',
-   output: 'resources.c',
-   command: [
-+    'env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../gdk-pixbuf',
-     gen_resources,
-     '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
-     '--loaders=@0@'.format(loaders_cache.full_path()),
-@@ -23,6 +24,7 @@ resources_h = custom_target('resources.h
-   input: 'resources.gresource.xml',
-   output: 'resources.h',
-   command: [
-+    'env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../gdk-pixbuf',
-     gen_resources,
-     '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
-     '--loaders=@0@'.format(loaders_cache.full_path()),
+@@ -12,6 +12,7 @@ if enabled_loaders.contains('png') and h
+     input: 'resources.gresource.xml',
+     output: 'resources.c',
+     command: [
++      'env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../gdk-pixbuf',
+       gen_resources,
+       '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()),
+       '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
+@@ -31,6 +32,7 @@ if enabled_loaders.contains('png') and h



Home | Main Index | Thread Index | Old Index