CVS commit: pkgsrc/graphics/gdk-pixbuf2

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Thu Feb 20 03:35:35 UTC 2020

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

Log Message:
gdk-pixbuf2: Fix build on certain Darwin configurations.

During the build, newly compiled applications are run and require libraries also
within the build area.  At least on Darwin, these must be accessed via
LD_LIBRARY_PATH, which must be added to the meson build files to be included in
the appropriate commands.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/gdk-pixbuf2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_meson.build \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build \
    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/distinfo
diff -u pkgsrc/graphics/gdk-pixbuf2/distinfo:1.45 pkgsrc/graphics/gdk-pixbuf2/distinfo:1.46
--- pkgsrc/graphics/gdk-pixbuf2/distinfo:1.45   Wed Nov  6 13:52:51 2019
+++ pkgsrc/graphics/gdk-pixbuf2/distinfo        Thu Feb 20 03:35:35 2020
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.45 2019/11/06 13:52:51 wiz Exp $
+$NetBSD: distinfo,v 1.46 2020/02/20 03:35:35 brook 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 (patch-gdk-pixbuf_meson.build) = 58b53744e4cc846ddc9492b86d8964c6c19ed5e2
 SHA1 (patch-meson.build) = e98fcafc3a123e4af8f26ba93c3a21af5fa37e2b
+SHA1 (patch-tests_meson.build) = 743abfb1d4e505882c4d304fc33ad60a3821e584
+SHA1 (patch-thumbnailer_meson.build) = fb9b7523663ac595ef66c8cf41837a733ac44216

Added files:

Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_meson.build
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_meson.build:1.1
--- /dev/null   Thu Feb 20 03:35:36 2020
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_meson.build    Thu Feb 20 03:35:35 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-gdk-pixbuf_meson.build,v 1.1 2020/02/20 03:35:35 brook Exp $
+
+Add LD_LIBRARY_PATH so uninstalled programs find newly built shared libraries.
+
+--- gdk-pixbuf/meson.build.orig        2019-10-08 10:44:10.000000000 +0000
++++ gdk-pixbuf/meson.build
+@@ -316,6 +316,7 @@ if not meson.is_cross_build()
+                                 output: 'loaders.cache',
+                                 capture: true,
+                                 command: [
++                                'env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../gdk-pixbuf',
+                                   gdk_pixbuf_query_loaders,
+                                   dynamic_loaders,
+                                 ],
Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build:1.1
--- /dev/null   Thu Feb 20 03:35:36 2020
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-tests_meson.build Thu Feb 20 03:35:35 2020
@@ -0,0 +1,22 @@
+$NetBSD: patch-tests_meson.build,v 1.1 2020/02/20 03:35:35 brook 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
+@@ -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()),
Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build:1.1
--- /dev/null   Thu Feb 20 03:35:36 2020
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-thumbnailer_meson.build   Thu Feb 20 03:35:35 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-thumbnailer_meson.build,v 1.1 2020/02/20 03:35:35 brook Exp $
+
+Add LD_LIBRARY_PATH so uninstalled programs find newly built shared libraries.
+
+--- thumbnailer/meson.build.orig       2019-10-08 10:44:10.000000000 +0000
++++ thumbnailer/meson.build
+@@ -16,6 +16,7 @@ custom_target('thumbnailer',
+               input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
+               output: 'gdk-pixbuf-thumbnailer.thumbnailer',
+               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()),