CVS commit: pkgsrc/graphics/xbmbrowser

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 18 14:47:39 UTC 2026

Modified Files:
        pkgsrc/graphics/xbmbrowser: distinfo
        pkgsrc/graphics/xbmbrowser/patches: patch-ab patch-ad
Added Files:
        pkgsrc/graphics/xbmbrowser/patches: patch-IconLabel.c

Log Message:
xbmbrowser: Fix building with recent GCC.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/xbmbrowser/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/xbmbrowser/patches/patch-IconLabel.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/xbmbrowser/patches/patch-ab \
    pkgsrc/graphics/xbmbrowser/patches/patch-ad

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

Modified files:

Index: pkgsrc/graphics/xbmbrowser/distinfo
diff -u pkgsrc/graphics/xbmbrowser/distinfo:1.9 pkgsrc/graphics/xbmbrowser/distinfo:1.10
--- pkgsrc/graphics/xbmbrowser/distinfo:1.9     Tue Oct 26 10:47:24 2021
+++ pkgsrc/graphics/xbmbrowser/distinfo Wed Mar 18 14:47:39 2026
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:47:24 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/03/18 14:47:39 nia Exp $
 
 BLAKE2s (xbmbrowser5.1.tar.gz) = e7e24a928ab8f13c804c1e3e41d8abc0d3b5d276ace5f7bd8303a8546696590d
 SHA512 (xbmbrowser5.1.tar.gz) = eb89843e894115354866ca9f600ec9105ec2c2fb7768fcaec170b7365be591349ddd7829acd08b5ab8f7a24af6f4cfb97ccf7773eb1001341b29d1f79c6aa0d0
 Size (xbmbrowser5.1.tar.gz) = 74397 bytes
+SHA1 (patch-IconLabel.c) = 9b7695d371d5330e8f5f0b421ebe1ec20b0a64c4
 SHA1 (patch-aa) = 1c1087555ca33e3319810b8f66cf510b047f8233
-SHA1 (patch-ab) = cc7e87ea599664f94ff8c791efb3d4820197cc45
+SHA1 (patch-ab) = c628d9b16dc60ca4425d844c093ed930dd6aae20
 SHA1 (patch-ac) = e78c96437e4dbf41f064983fe0a96a08bf3a67f6
-SHA1 (patch-ad) = 335297bb9c7df40007118e162e0624214d249677
+SHA1 (patch-ad) = d6471f1c4541ba1f533d1f6ad6e2d597d08d9a3e
 SHA1 (patch-ae) = 51b95dde72bcb95b426401458088750eb026cc43

Index: pkgsrc/graphics/xbmbrowser/patches/patch-ab
diff -u pkgsrc/graphics/xbmbrowser/patches/patch-ab:1.1 pkgsrc/graphics/xbmbrowser/patches/patch-ab:1.2
--- pkgsrc/graphics/xbmbrowser/patches/patch-ab:1.1     Mon Jun 26 16:11:43 2006
+++ pkgsrc/graphics/xbmbrowser/patches/patch-ab Wed Mar 18 14:47:39 2026
@@ -1,16 +1,27 @@
-$NetBSD: patch-ab,v 1.1 2006/06/26 16:11:43 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2026/03/18 14:47:39 nia Exp $
 
---- xbmbrowser.h.orig  2006-06-26 15:27:35.000000000 +0000
+--- xbmbrowser.h.orig  1995-07-19 03:45:03.000000000 +0000
 +++ xbmbrowser.h
-@@ -27,6 +27,7 @@
+@@ -25,8 +25,10 @@
+ #include <X11/StringDefs.h>
+ 
  #include <stdio.h>             /* C library includes */
++#include <stdlib.h>
  #include <dirent.h>            /* Filename length (and dir functions) */
  #include <assert.h>            /* debugging assertions */
 +#include <limits.h>
  
  #include <X11/Xaw/Form.h>      /* widget includes */
  #include <X11/Xaw/Box.h>
-@@ -82,8 +83,13 @@ enum FileType {
+@@ -39,6 +41,7 @@
+ #include <X11/Xaw/List.h>
+ #include <X11/Xaw/Paned.h>
+ #include <X11/Xaw/Viewport.h>
++#include <X11/Xmu/Drawing.h>
+ 
+ #include "IconLabel.h"         /* Special Widget -- IconLabel */
+ 
+@@ -82,8 +85,13 @@ enum FileType {
  /* item structure */
  typedef struct _item {
    struct _item     *next;               /* next item */
@@ -24,7 +35,7 @@ $NetBSD: patch-ab,v 1.1 2006/06/26 16:11
    time_t            mtime;              /* last modification time */
    enum FileType     type;               /* file type */
    Boolean           visible;            /* visible to user? */
-@@ -167,6 +173,18 @@ ext Widget     menu_bitmap, menu_pixmap;
+@@ -167,6 +175,18 @@ ext Widget     menu_bitmap, menu_pixmap;
  ext Widget     menu_directory, menu_other;
  
  /* substitution strings for function argument macro substitions */
@@ -43,7 +54,7 @@ $NetBSD: patch-ab,v 1.1 2006/06/26 16:11
  ext char     dir_name[MAXNAMLEN];     /* %d the current directory */
  ext char     file_name[MAXNAMLEN];    /* %f current filename */
  ext char     base_name[MAXNAMLEN];    /* %b basename for current file */
-@@ -177,6 +195,7 @@ ext char     init_dir[MAXNAMLEN];     /*
+@@ -177,6 +197,7 @@ ext char     init_dir[MAXNAMLEN];     /*
  
  /* Information strings for display in application label */
  ext char     label_info[MAXNAMLEN];   /* label to show when outside bitmap */
@@ -51,3 +62,11 @@ $NetBSD: patch-ab,v 1.1 2006/06/26 16:11
  ext Item    *current_item;            /* which item the user is pointing to */
  
  /* some external variables */
+@@ -228,6 +249,7 @@ extern void    init_stipple();       /* 
+ extern Item   *get_files();          /* Scan a directory and initialise items */
+ extern time_t  check_file_time();    /* check if a file was modified */
+ 
++extern void  read_user_menus();
+ 
+ /*********** Macros ************/
+ 
Index: pkgsrc/graphics/xbmbrowser/patches/patch-ad
diff -u pkgsrc/graphics/xbmbrowser/patches/patch-ad:1.1 pkgsrc/graphics/xbmbrowser/patches/patch-ad:1.2
--- pkgsrc/graphics/xbmbrowser/patches/patch-ad:1.1     Mon Jun 26 16:11:43 2006
+++ pkgsrc/graphics/xbmbrowser/patches/patch-ad Wed Mar 18 14:47:39 2026
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2006/06/26 16:11:43 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2026/03/18 14:47:39 nia Exp $
 
---- xbmbrowser.c.orig  2006-06-26 15:30:08.000000000 +0000
+--- xbmbrowser.c.orig  1995-07-19 03:49:10.000000000 +0000
 +++ xbmbrowser.c
-@@ -279,7 +279,11 @@ main(argc, argv)
+@@ -224,6 +224,7 @@ static void usage()
+ }
+ 
+ 
++int
+ main(argc, argv)
+   int argc;
+   char **argv;
+@@ -279,7 +280,11 @@ main(argc, argv)
    { extern char *getenv();
      (void) strcpy(home_dir, getenv("HOME"));
      if( strcmp(home_dir,"/") != 0 )
@@ -14,7 +22,7 @@ $NetBSD: patch-ad,v 1.1 2006/06/26 16:11
    }
  
    /* Initialize other substitution strings */
-@@ -314,7 +318,11 @@ main(argc, argv)
+@@ -314,7 +319,11 @@ main(argc, argv)
    /* Initialize user menus from the appropiate RC file */
    /* Do this before we chdir() into some other directory */
    { FILE *rc;
@@ -26,7 +34,7 @@ $NetBSD: patch-ad,v 1.1 2006/06/26 16:11
  
       menu_global = menu_bitmap = menu_pixmap =
          menu_directory = menu_other = NULL;
-@@ -358,9 +366,15 @@ main(argc, argv)
+@@ -358,9 +367,15 @@ main(argc, argv)
      fprintf(stderr,"xbmbrowser: couldn't chdir to '%s'\n",argv[1]);
      exit(-1);
    }

Added files:

Index: pkgsrc/graphics/xbmbrowser/patches/patch-IconLabel.c
diff -u /dev/null pkgsrc/graphics/xbmbrowser/patches/patch-IconLabel.c:1.1
--- /dev/null   Wed Mar 18 14:47:39 2026
+++ pkgsrc/graphics/xbmbrowser/patches/patch-IconLabel.c        Wed Mar 18 14:47:39 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-IconLabel.c,v 1.1 2026/03/18 14:47:39 nia Exp $
+
+Fix implicit function declarations.
+
+--- IconLabel.c.orig   2026-03-18 14:22:18.963678185 +0000
++++ IconLabel.c
+@@ -33,6 +33,7 @@
+ 
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
++#include <X11/Xmu/Drawing.h>
+ #include "IconLabelP.h"          /* Private header file */
+ 
+ /* shape extension stuff */