fltk14-devel: Update to git 4742d830beb17bd92fed83eb58cede09bfddd576

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Mar 25 13:18:44 2024 +0100
Changeset:	d92bde33c3035570a4b07f24eb3903dd5e74500d

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/buildlink3.mk
	fltk14-devel/distinfo
	fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx

Log Message:
fltk14-devel: Update to git 4742d830beb17bd92fed83eb58cede09bfddd576

Declare required API for "cairo" option.
New patch for mount point detection on AIX and NetBSD.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d92bde33c3035570a4b07f24eb3903dd5e74500d

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

diffstat:
 fltk14-devel/Makefile                              |  2 +-
 fltk14-devel/buildlink3.mk                         |  1 +
 fltk14-devel/distinfo                              |  8 ++--
 ...h-src_drivers_Unix_Fl__Unix__System__Driver.cxx | 48 ++++++++++++++--------
 4 files changed, 38 insertions(+), 21 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 89d27dfdc4..bb1c390578 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG=	b3b051240ecf3ab562e73d3d5674d05aff261fc4
+GITHUB_TAG=	4742d830beb17bd92fed83eb58cede09bfddd576
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
index ed01734ed7..4b3ddf619d 100644
--- a/fltk14-devel/buildlink3.mk
+++ b/fltk14-devel/buildlink3.mk
@@ -16,6 +16,7 @@ pkgbase := fltk
 
 # For "cairo" option
 .if ${PKG_BUILD_OPTIONS.fltk:Mcairo}
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.0
 .  include "../../graphics/cairo/buildlink3.mk"
 .endif
 
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 853e1b53d5..5ba5549e52 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-BLAKE2s (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = e491702d1b157fb6a39dc0f9748af0ce6b0269133ed37338ab1a02a1eae0ec8a
-SHA512 (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = b7878bba337308429ee8595c73124cb671f556539061d8f3922ed2c70a117e9f452afa4b9ffddc832ab3644cd44d1dafaac07cf85a0c99aa3d1341850a44cfa7
-Size (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = 9337926 bytes
+BLAKE2s (fltk-1.4.x-4742d830beb17bd92fed83eb58cede09bfddd576.zip) = 27fab8115caf7cb1fb6ae9bb7a4fee7ec90ebd77d494de9011d6b9e4f3cfe18d
+SHA512 (fltk-1.4.x-4742d830beb17bd92fed83eb58cede09bfddd576.zip) = 3d87dabf4cc1bb8d14bcdea5261c49ea5e31dfd0951226874b60d13fa9a041dfb8b2fa97f51aa7e521a846b6537b66970fddb3d647a484378d219c5f3b4d3397
+Size (fltk-1.4.x-4742d830beb17bd92fed83eb58cede09bfddd576.zip) = 9338058 bytes
 SHA1 (patch-documentation_Makefile) = 4af65225feb343f8d4bf1af11cfb4929b7fe81c6
-SHA1 (patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx) = 6540336c4a8d53a8b5272d0d28baa73db7de5410
+SHA1 (patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx) = f88dbbc696afe375e850555c0579dec67c106ac2
diff --git a/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx b/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx
index 04a91c76b2..9e0fbd1946 100644
--- a/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx
+++ b/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx
@@ -1,26 +1,42 @@
 $NetBSD$
 
-Fix mount point detection code for AIX.
+Fix mount point detection code for AIX and NetBSD.
 https://github.com/fltk/fltk/issues/942
+https://github.com/fltk/fltk/issues/944
 
---- src/drivers/Unix/Fl_Unix_System_Driver.cxx.orig	2024-03-20 16:41:08.000000000 +0000
+--- src/drivers/Unix/Fl_Unix_System_Driver.cxx.orig	2024-03-24 07:48:45.000000000 +0000
 +++ src/drivers/Unix/Fl_Unix_System_Driver.cxx
-@@ -278,7 +278,7 @@ int Fl_Unix_System_Driver::file_browser_
-   struct vmount *vp;
+@@ -278,6 +278,8 @@ int Fl_Unix_System_Driver::file_browser_
  
    // We always have the root filesystem
--  add("/", icon);
-+  browser->add("/", icon);
+   browser->add("/", icon);
++  num_files++;
++
    // Get the required buffer size for the vmount structures
    res = mntctl(MCTL_QUERY, sizeof(len), (char *) &len);
    if (!res) {
-@@ -292,7 +292,8 @@ int Fl_Unix_System_Driver::file_browser_
-       if (0 >= res) {
-         res = -1;
-       } else {
--        for (int i = 0, vp = (struct vmount *) list; i < res; ++i) {
-+        vp = (struct vmount *) list;
-+        for (int i = 0; i < res; ++i) {
-           name = (char *) vp + vp->vmt_data[VMT_STUB].vmt_off;
-           strlcpy(filename, name, lname);
-           // Skip the already added root filesystem
+@@ -299,6 +301,7 @@ int Fl_Unix_System_Driver::file_browser_
+           if (strcmp("/", filename) != 0) {
+             strlcat(filename, "/", lname);
+             browser->add(filename, icon);
++            num_files++;
+           }
+           vp = (struct vmount *) ((char *) vp + vp->vmt_length);
+         }
+@@ -317,6 +320,8 @@ int Fl_Unix_System_Driver::file_browser_
+ 
+   // We always have the root filesystem
+   browser->add("/", icon);
++  num_files++;
++
+ #  ifdef HAVE_PTHREAD
+   // Lock mutex for thread safety
+   if (!pthread_mutex_lock(&getvfsstat_mutex)) {
+@@ -330,6 +335,7 @@ int Fl_Unix_System_Driver::file_browser_
+         if (strcmp("/", filename) != 0) {
+           strlcat(filename, "/", lname);
+           browser->add(filename, icon);
++          num_files++;
+         }
+       }
+     } else {