pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fltk14-devel: Should now work on AIX again.



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Mar 22 14:23:56 2024 +0100
Changeset:	f203979ba90ac07bc9dddb0c24adca712b5015c1

Modified Files:
	fltk14-devel/TODO
	fltk14-devel/distinfo
Added Files:
	fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx

Log Message:
fltk14-devel: Should now work on AIX again.

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

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

diffstat:
 fltk14-devel/TODO                                  |  3 ++-
 fltk14-devel/distinfo                              |  4 ++--
 ...h-src_drivers_Unix_Fl__Unix__System__Driver.cxx | 26 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diffs:
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
index c331b1f415..6abaadd6cc 100644
--- a/fltk14-devel/TODO
+++ b/fltk14-devel/TODO
@@ -1,7 +1,8 @@
 [X] Add zlib dependency
 [X] Support for HP-UX
     Added upstream (Issue #937).
-[ ] Support for AIX
+[X] Support for AIX
+    Added pkgsrc patch (Issue #942).
 [ ] Static libraries should not be installed with execute permissions
     "fltk.list" has entires with 444 permissions, looks like a bug.
 [ ] Check for library suffixes on AIX, HP-UX and macOS
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 1cab8584d6..853e1b53d5 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = 01b77299e8249ff2e336c48505daa3f3dcb54a67
-RMD160 (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = 2a4c294afcce823ce3a5b13f008484d736542a04
+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
 SHA1 (patch-documentation_Makefile) = 4af65225feb343f8d4bf1af11cfb4929b7fe81c6
+SHA1 (patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx) = 6540336c4a8d53a8b5272d0d28baa73db7de5410
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
new file mode 100644
index 0000000000..04a91c76b2
--- /dev/null
+++ b/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Fix mount point detection code for AIX.
+https://github.com/fltk/fltk/issues/942
+
+--- 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
+@@ -278,7 +278,7 @@ int Fl_Unix_System_Driver::file_browser_
+   struct vmount *vp;
+ 
+   // We always have the root filesystem
+-  add("/", icon);
++  browser->add("/", icon);
+   // 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


Home | Main Index | Thread Index | Old Index