CVS commit: pkgsrc/x11/ocaml-lablgtk3

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Nov 24 12:20:57 UTC 2024

Modified Files:
        pkgsrc/x11/ocaml-lablgtk3: Makefile distinfo
Added Files:
        pkgsrc/x11/ocaml-lablgtk3/patches: patch-src_dune

Log Message:
x11/ocaml-lablgtk3: Add -verbose when using pkg-config

This doesn't fix the build, but it provides a clue: dune code is
objecting to the pkg-config that is found, which is a shell script
wrapper:

  File "src/dune", line 9, characters 0-128:
   9 | (rule
  10 |  (targets
  11 |    cflag-gtk+-3.0.sexp
  12 |    clink-gtk+-3.0.sexp)
  13 |  (action (run dune_config -verbose -pkg gtk+-3.0 -version 3.18)))
  (cd _build/default/src && ../.bin/dune_config -verbose -pkg gtk+-3.0 -version 3.18)
  which: /tmp/work/x11/ocaml-lablgtk3/work/.tools/bin/pkg-config
  -> not found
  configure error: pkg_config not installed

Take maintainership (offlist discussion with jaapb@).


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/ocaml-lablgtk3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/ocaml-lablgtk3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/ocaml-lablgtk3/patches/patch-src_dune

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/ocaml-lablgtk3/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk3/Makefile:1.32 pkgsrc/x11/ocaml-lablgtk3/Makefile:1.33
--- pkgsrc/x11/ocaml-lablgtk3/Makefile:1.32     Sun Nov 17 07:17:00 2024
+++ pkgsrc/x11/ocaml-lablgtk3/Makefile  Sun Nov 24 12:20:57 2024
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.32 2024/11/17 07:17:00 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2024/11/24 12:20:57 gdt Exp $
 
 GITHUB_PROJECT=        lablgtk
 GITHUB_TAG=    ${VERSION}
 VERSION=       3.1.3
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${GITHUB_PROJECT}3-${VERSION}
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=garrigue/}
 
-MAINTAINER=    jaapb%NetBSD.org@localhost
+MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/garrigue/lablgtk/
 COMMENT=       GTK+ 3.x bindings for OCaml
 LICENSE=       gnu-lgpl-v2

Index: pkgsrc/x11/ocaml-lablgtk3/distinfo
diff -u pkgsrc/x11/ocaml-lablgtk3/distinfo:1.6 pkgsrc/x11/ocaml-lablgtk3/distinfo:1.7
--- pkgsrc/x11/ocaml-lablgtk3/distinfo:1.6      Fri Nov 11 10:47:55 2022
+++ pkgsrc/x11/ocaml-lablgtk3/distinfo  Sun Nov 24 12:20:57 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2022/11/11 10:47:55 jaapb Exp $
+$NetBSD: distinfo,v 1.7 2024/11/24 12:20:57 gdt Exp $
 
 BLAKE2s (lablgtk-3.1.3.tar.gz) = 85128f6dca11343410b0e5229e659bbbba08d98004c8bffb535f0b7734312cb6
 SHA512 (lablgtk-3.1.3.tar.gz) = a14e07145a2844ebb039d7af459e2fac61888c27925ed14e508698f622aeb5ec3b0694f2b87fb7b5383d8979791a3e6fe8425f4bb509effe838d0a09dd9c50b9
 Size (lablgtk-3.1.3.tar.gz) = 1043246 bytes
+SHA1 (patch-src_dune) = 47d9fb3af9dbcdff95fa99511889586d5a6b122b

Added files:

Index: pkgsrc/x11/ocaml-lablgtk3/patches/patch-src_dune
diff -u /dev/null pkgsrc/x11/ocaml-lablgtk3/patches/patch-src_dune:1.1
--- /dev/null   Sun Nov 24 12:20:57 2024
+++ pkgsrc/x11/ocaml-lablgtk3/patches/patch-src_dune    Sun Nov 24 12:20:57 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_dune,v 1.1 2024/11/24 12:20:57 gdt Exp $
+
+Enable debugging on dune_config.  This may break things, once
+dune_config can run pkg-config, but for now it is helpful debugging.
+
+--- src/dune.orig      2022-10-06 07:24:16.000000000 +0000
++++ src/dune
+@@ -10,7 +10,7 @@
+  (targets
+    cflag-gtk+-3.0.sexp
+    clink-gtk+-3.0.sexp)
+- (action (run dune_config -pkg gtk+-3.0 -version 3.18)))
++ (action (run dune_config -verbose -pkg gtk+-3.0 -version 3.18)))
+ 
+ (rule
+  (targets cflag-extraflags.sexp)