CVS commit: pkgsrc/graphics/gimp-devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 10 16:32:37 UTC 2022

Modified Files:
        pkgsrc/graphics/gimp-devel: distinfo
        pkgsrc/graphics/gimp-devel/patches: patch-meson.build

Log Message:
gimp-devel: use upstream version of patch


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/gimp-devel/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gimp-devel/patches/patch-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/gimp-devel/distinfo
diff -u pkgsrc/graphics/gimp-devel/distinfo:1.3 pkgsrc/graphics/gimp-devel/distinfo:1.4
--- pkgsrc/graphics/gimp-devel/distinfo:1.3     Sat Sep 10 13:47:01 2022
+++ pkgsrc/graphics/gimp-devel/distinfo Sat Sep 10 16:32:37 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2022/09/10 13:47:01 wiz Exp $
+$NetBSD: distinfo,v 1.4 2022/09/10 16:32:37 wiz Exp $
 
 BLAKE2s (gimp-2.99.12.tar.xz) = 6ecf4138713bf0c514463a644a54a7a39c69c9d99931cf9af991ef78d4b6809a
 SHA512 (gimp-2.99.12.tar.xz) = 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
 Size (gimp-2.99.12.tar.xz) = 24282140 bytes
-SHA1 (patch-meson.build) = 40744c94dff37f190539992f80b2c9597fe1cd5f
+SHA1 (patch-meson.build) = 539b308e4cb5757180e3a19b1f92934f085fcbb9
 SHA1 (patch-plug-ins_common_file-heif.c) = cf4beb68136aefe460c7cabf53a2c40d602ec682
 SHA1 (patch-tools_extract-vector-icon.sh) = e460c42656bf2611a3735e2f7b4fe1d927a47044

Index: pkgsrc/graphics/gimp-devel/patches/patch-meson.build
diff -u pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.2 pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.3
--- pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.2    Sat Sep 10 13:47:01 2022
+++ pkgsrc/graphics/gimp-devel/patches/patch-meson.build        Sat Sep 10 16:32:37 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.2 2022/09/10 13:47:01 wiz Exp $
+$NetBSD: patch-meson.build,v 1.3 2022/09/10 16:32:37 wiz Exp $
 
 Avoid libdl dependency on NetBSD.
 https://gitlab.gnome.org/GNOME/gimp/-/issues/8604
@@ -8,23 +8,16 @@ https://gitlab.gnome.org/GNOME/gimp/-/is
 
 --- meson.build.orig   2022-08-21 19:21:38.000000000 +0000
 +++ meson.build
-@@ -127,6 +127,10 @@ platform_linux = (
-   host_os.contains('linux')
- )
- 
-+platform_netbsd = (
-+  host_os.contains('netbsd')
-+)
-+
- platform_windows = (
-   host_os.contains('mingw') or
-   host_os.contains('cygwin') or
-@@ -321,7 +325,7 @@ conf.set('ENABLE_RELOCATABLE_RESOURCES',
+@@ -321,7 +321,11 @@ conf.set('ENABLE_RELOCATABLE_RESOURCES',
  
  
  math              = cc.find_library('m')
 -dl                = platform_windows ? no_dep : cc.find_library('dl')
-+dl                = (platform_windows or platform_netbsd) ? no_dep : cc.find_library('dl')
++# libdl is only required on Linux. On Windows and some (all?) BSD, it
++# doesn't exist, but the API exists in libc by default (see #8604). On
++# macOS, it apparently exists but linking it explicitly is actually
++# unneeded as well.
++dl                = cc.find_library('dl', required: platform_linux)
  rpc               = platform_windows ? cc.find_library('rpcrt4') : no_dep
  dbghelp           = platform_windows ? cc.find_library('dbghelp') : no_dep
  winsock           = platform_windows ? cc.find_library('ws2_32') : no_dep