CVS commit: pkgsrc/graphics/gdk-pixbuf2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/gdk-pixbuf2
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 27 Jun 2024 15:19:59 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jun 27 15:19:59 UTC 2024

Modified Files:
        pkgsrc/graphics/gdk-pixbuf2: Makefile PLIST distinfo
        pkgsrc/graphics/gdk-pixbuf2/patches: patch-tests_meson.build
            patch-thumbnailer_meson.build

Log Message:
gdk-pixbuf2: updated to 2.42.12

2.42.12 (stable)

- Fix a build failure (Christian Heusel)
- Fix occasional build failures (Benjamin Gilbert)
- ani: Reject files with multiple INA or IART chunks (Benjamin Gilbert)
- ani: Reject files with multiple anih chunks (Benjamin Gilbert, CVE-2022-48622)
- ani: validate chunk size (Benjamin Gilbert)
- Translation updates

2.42.11 (stable)

- Disable fringe loaders by default
- Introspection fixes
- Translation updates


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/graphics/gdk-pixbuf2/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/gdk-pixbuf2/PLIST
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/gdk-pixbuf2/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build

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
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.64 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.65
--- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.64   Tue May  7 11:15:18 2024
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile        Thu Jun 27 15:19:59 2024
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2024/05/07 11:15:18 gdt Exp $
+# $NetBSD: Makefile,v 1.65 2024/06/27 15:19:59 adam Exp $
 
-# NB: the 2.42.11 release is broken
-# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/169
-DISTNAME=      gdk-pixbuf-2.42.10
+DISTNAME=      gdk-pixbuf-2.42.12
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
-PKGREVISION=   4
 CATEGORIES=    graphics gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -41,6 +38,8 @@ SUBST_SED.dyld=               -e 's|@LD_LIBRARY_PATH@
 .endif
 
 MESON_ARGS+=                   -D installed_tests=false
+# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/169
+MESON_ARGS+=                   -D others=enabled
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 PKGCONFIG_OVERRIDE=            output/meson-private/gdk-pixbuf-2.0.pc
 

Index: pkgsrc/graphics/gdk-pixbuf2/PLIST
diff -u pkgsrc/graphics/gdk-pixbuf2/PLIST:1.25 pkgsrc/graphics/gdk-pixbuf2/PLIST:1.26
--- pkgsrc/graphics/gdk-pixbuf2/PLIST:1.25      Fri Apr 12 19:41:39 2024
+++ pkgsrc/graphics/gdk-pixbuf2/PLIST   Thu Jun 27 15:19:59 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2024/04/12 19:41:39 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.26 2024/06/27 15:19:59 adam Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
@@ -87,6 +87,7 @@ share/locale/is/LC_MESSAGES/gdk-pixbuf.m
 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/kab/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

Index: pkgsrc/graphics/gdk-pixbuf2/distinfo
diff -u pkgsrc/graphics/gdk-pixbuf2/distinfo:1.55 pkgsrc/graphics/gdk-pixbuf2/distinfo:1.56
--- pkgsrc/graphics/gdk-pixbuf2/distinfo:1.55   Sun Nov 13 09:59:02 2022
+++ pkgsrc/graphics/gdk-pixbuf2/distinfo        Thu Jun 27 15:19:59 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.55 2022/11/13 09:59:02 adam Exp $
+$NetBSD: distinfo,v 1.56 2024/06/27 15:19:59 adam Exp $
 
-BLAKE2s (gdk-pixbuf-2.42.10.tar.xz) = d42814ff27616afc8ed6dd8c7f641306822cff8a32b839b61d95b2528454080e
-SHA512 (gdk-pixbuf-2.42.10.tar.xz) = ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a
-Size (gdk-pixbuf-2.42.10.tar.xz) = 6519776 bytes
+BLAKE2s (gdk-pixbuf-2.42.12.tar.xz) = 14d58a61c191af2ef5ec7dd747f82cd9962d8bb38b2da345f496812e3861576b
+SHA512 (gdk-pixbuf-2.42.12.tar.xz) = ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8
+Size (gdk-pixbuf-2.42.12.tar.xz) = 6525072 bytes
 SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = a9d2436711b1a1c3bb58beef0df5e485ad6cbe7d
 SHA1 (patch-gdk-pixbuf_meson.build) = d54c4f1c5c045c3988fc2bbac19d2aac3e32de89
-SHA1 (patch-tests_meson.build) = 6da53b4e168a20dcc546840e4fbd8fc7ac8f03aa
-SHA1 (patch-thumbnailer_meson.build) = c4a5abaced448add0c28f3b391b9db86b4299c02
+SHA1 (patch-tests_meson.build) = 7d60098d957e4b0677aad6452de651189fc06b2d
+SHA1 (patch-thumbnailer_meson.build) = 25d1ee1934bed00b4353ce33dacd52e3414b943f

Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build
diff -u pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build:1.3 pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build:1.4
--- pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build:1.3     Wed Nov 17 15:14:42 2021
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build Thu Jun 27 15:19:59 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-tests_meson.build,v 1.3 2021/11/17 15:14:42 schmonz Exp $
+$NetBSD: patch-tests_meson.build,v 1.4 2024/06/27 15:19:59 adam Exp $
 
 Add LD_LIBRARY_PATH so uninstalled programs find newly built shared libraries.
 
---- tests/meson.build.orig     2021-04-09 14:44:51.000000000 +0000
+--- tests/meson.build.orig     2024-05-15 02:15:41.000000000 +0000
 +++ tests/meson.build
 @@ -12,6 +12,7 @@ if enabled_loaders.contains('png') and h
      input: 'resources.gresource.xml',
@@ -10,13 +10,13 @@ Add LD_LIBRARY_PATH so uninstalled progr
      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
+       '--glib-compile-resources', glib_compile_resources,
+       '--pixdata', gdk_pixbuf_pixdata,
+@@ -27,6 +28,7 @@ if enabled_loaders.contains('png') and h
      input: 'resources.gresource.xml',
      output: 'resources.h',
      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()),
+       '--glib-compile-resources', glib_compile_resources,
+       '--pixdata', gdk_pixbuf_pixdata,

Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build
diff -u pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build:1.2 pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build:1.3
--- pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build:1.2       Wed Nov 17 15:14:42 2021
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build   Thu Jun 27 15:19:59 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-thumbnailer_meson.build,v 1.2 2021/11/17 15:14:42 schmonz Exp $
+$NetBSD: patch-thumbnailer_meson.build,v 1.3 2024/06/27 15:19:59 adam Exp $
 
 Add LD_LIBRARY_PATH so uninstalled programs find newly built shared libraries.
 
---- thumbnailer/meson.build.orig       2021-04-09 14:44:51.000000000 +0000
+--- thumbnailer/meson.build.orig       2024-05-15 02:15:41.000000000 +0000
 +++ thumbnailer/meson.build
 @@ -17,6 +17,7 @@ custom_target('thumbnailer',
                input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
@@ -10,5 +10,5 @@ Add LD_LIBRARY_PATH so uninstalled progr
                command: [
 +              'env', '@LD_LIBRARY_PATH@=' + meson.current_build_dir() + '/../gdk-pixbuf',
                  gen_thumbnailer,
-                 '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()),
-                 '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
+                 '--printer', gdk_pixbuf_print_mime_types,
+                 '--pixdata', gdk_pixbuf_pixdata,

Prev by Date: CVS commit: pkgsrc/misc/libreoffice
Next by Date: CVS commit: pkgsrc/graphics/gdk-pixbuf2
Previous by Thread: CVS commit: pkgsrc/misc/libreoffice
Next by Thread: CVS commit: pkgsrc/graphics/gdk-pixbuf2
Indexes:

Home | Main Index | Thread Index | Old Index