CVS commit: pkgsrc/x11/xlockmore

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun 24 22:06:09 UTC 2026

Modified Files:
        pkgsrc/x11/xlockmore: distinfo
Added Files:
        pkgsrc/x11/xlockmore/patches: patch-xglock_xglock.c

Log Message:
xlockmore: remove broken prototypes to fix build on -current


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/x11/xlockmore/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xlockmore/patches/patch-xglock_xglock.c

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

Modified files:

Index: pkgsrc/x11/xlockmore/distinfo
diff -u pkgsrc/x11/xlockmore/distinfo:1.68 pkgsrc/x11/xlockmore/distinfo:1.69
--- pkgsrc/x11/xlockmore/distinfo:1.68  Wed Feb 11 13:15:44 2026
+++ pkgsrc/x11/xlockmore/distinfo       Wed Jun 24 22:06:09 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.68 2026/02/11 13:15:44 micha Exp $
+$NetBSD: distinfo,v 1.69 2026/06/24 22:06:09 wiz Exp $
 
 BLAKE2s (xlockmore-5.88.tar.xz) = 90b77657f7c07c7ea5fe16c20c9bc7be04db824112b24f2365ec3deebf7dc999
 SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3
 Size (xlockmore-5.88.tar.xz) = 2090620 bytes
 SHA1 (patch-configure.ac) = 9bb4e744a493d8a30933d8a1d37d73f8de03ea0f
 SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
+SHA1 (patch-xglock_xglock.c) = 6766cf62537ee6604c7203ad3d66040c95a0c377
 SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a

Added files:

Index: pkgsrc/x11/xlockmore/patches/patch-xglock_xglock.c
diff -u /dev/null pkgsrc/x11/xlockmore/patches/patch-xglock_xglock.c:1.1
--- /dev/null   Wed Jun 24 22:06:09 2026
+++ pkgsrc/x11/xlockmore/patches/patch-xglock_xglock.c  Wed Jun 24 22:06:09 2026
@@ -0,0 +1,62 @@
+$NetBSD: patch-xglock_xglock.c,v 1.1 2026/06/24 22:06:09 wiz Exp $
+
+The prototypes don't match the functions; remove them instead of fixing them.
+
+--- xglock/xglock.c.orig       2026-06-24 22:01:40.350287572 +0000
++++ xglock/xglock.c
+@@ -105,55 +105,7 @@ static GtkTooltips *tooltips=(GtkTooltips *)NULL;
+ /*static GtkWidget *font_sel_entry =(GtkWidget *)NULL;*/
+ static GtkTooltips *tooltips=(GtkTooltips *)NULL;
+ 
+-/* Prototypes */
+-#if defined( __ANSI_C__ ) || defined( NeedFunctionsPrototypes )
+-# define __PROTO( name, args )  name args
+-#else /* ! __ANSI_C__ && ! NeedFunctionsPrototypes */
+-# define __PROTO( name, args )  name ()
+-#endif /* ? __ANSI_C__ && ! NeedFunctionsPrototypes */
+-
+ #define STD_CB_ARGS   (GtkWidget *, gpointer)
+-
+-static void *__PROTO( secured_malloc, (size_t) );
+-static void *__PROTO( secured_calloc, (int, size_t) );
+-static void *__PROTO( secured_realloc, (void *, size_t) );
+-static gchar *__PROTO( check_quotes, (gchar *str) );
+-
+-static void __PROTO( mode_list_item_select_cb, STD_CB_ARGS );
+-static void __PROTO( mode_list_item_unselect_cb, STD_CB_ARGS );
+-static void __PROTO( compose_xlock_command, (char *) );
+-static void __PROTO( kill_xlock_cb, STD_CB_ARGS );
+-static void __PROTO( launch_xlock, STD_CB_ARGS );
+-static void __PROTO( exit_xglock, STD_CB_ARGS );
+-static void __PROTO( bool_option_clicked_cb, STD_CB_ARGS );
+-static void __PROTO( destroy_window, STD_CB_ARGS );
+-
+-static void __PROTO( color_selection_cancel_cb, STD_CB_ARGS );
+-static void __PROTO( color_selection_ok_cb, STD_CB_ARGS );
+-static void __PROTO( color_selection_changed_cb, STD_CB_ARGS );
+-static void __PROTO( create_color_selection_dialog, STD_CB_ARGS );
+-
+-/*static void __PROTO( font_select_item_select_cb, STD_CB_ARGS );*/
+-static void __PROTO( font_select_cancel_cb, STD_CB_ARGS );
+-static void __PROTO( font_select_ok_cb, STD_CB_ARGS );
+-static void __PROTO( create_font_selection_dialog, STD_CB_ARGS );
+-
+-static void __PROTO( file_selection_cancel_cb, STD_CB_ARGS );
+-static void __PROTO( file_selection_ok_cb, STD_CB_ARGS );
+-static void __PROTO( create_file_selection_dialog, STD_CB_ARGS );
+-
+-static void __PROTO( contextual_help_dialog, STD_CB_ARGS );
+-static void __PROTO( window_help_dialog, STD_CB_ARGS );
+-static void __PROTO( global_help_dialog, STD_CB_ARGS );
+-static void __PROTO( about_dialog, STD_CB_ARGS );
+-static void __PROTO( about_dialog_close_callback, STD_CB_ARGS );
+-
+-static GtkWidget * __PROTO( create_file_menu, (GtkWidget *) );
+-static GtkWidget * __PROTO( create_help_menu, (GtkWidget *) );
+-
+-static void __PROTO( create_fntColorOptions_entries, (GtkWidget *) );
+-static void __PROTO( create_genOptions_entries, (GtkWidget *) );
+-static void __PROTO( create_boolOptions_buttons, (GtkWidget *) );
+ 
+ #if GTK_CHECK_VERSION(2,0,0)
+ /* GTK+ 2.x differences */