CVS commit: pkgsrc/wm/fvwm

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun 18 09:43:23 UTC 2024

Modified Files:
        pkgsrc/wm/fvwm: distinfo
        pkgsrc/wm/fvwm/patches: patch-configure

Log Message:
fvwm: Fixes for C99 compatibility from Fedora


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/wm/fvwm/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/fvwm/patches/patch-configure

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

Modified files:

Index: pkgsrc/wm/fvwm/distinfo
diff -u pkgsrc/wm/fvwm/distinfo:1.11 pkgsrc/wm/fvwm/distinfo:1.12
--- pkgsrc/wm/fvwm/distinfo:1.11        Wed Jan 18 07:43:16 2023
+++ pkgsrc/wm/fvwm/distinfo     Tue Jun 18 09:43:23 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2023/01/18 07:43:16 vins Exp $
+$NetBSD: distinfo,v 1.12 2024/06/18 09:43:23 markd Exp $
 
 BLAKE2s (fvwm-2.7.0.tar.gz) = 193c01c6e3e111d04aa95ff51ee05552e709489dec8f65758ba4d93d290e767c
 SHA512 (fvwm-2.7.0.tar.gz) = fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808
 Size (fvwm-2.7.0.tar.gz) = 3933529 bytes
-SHA1 (patch-configure) = cf3ddf755d3b6d509cf722ed21ac8fd6c0ed7408
+SHA1 (patch-configure) = a31701c4b8bbce39d953d52906e893e973a0f2b9
 SHA1 (patch-fvwm_events.c) = effd8fd31a3c1f28a3e71dbcb9569621d996cc31
 SHA1 (patch-fvwm_fvwm.c) = 96515959482750a25bfe59e9a370d0ef0295bc89
 SHA1 (patch-libs_FEvent.c) = 358243d198251c6ea0bf546e31a94cb089355e45

Index: pkgsrc/wm/fvwm/patches/patch-configure
diff -u pkgsrc/wm/fvwm/patches/patch-configure:1.3 pkgsrc/wm/fvwm/patches/patch-configure:1.4
--- pkgsrc/wm/fvwm/patches/patch-configure:1.3  Wed Jan 18 07:43:16 2023
+++ pkgsrc/wm/fvwm/patches/patch-configure      Tue Jun 18 09:43:23 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2023/01/18 07:43:16 vins Exp $
+$NetBSD: patch-configure,v 1.4 2024/06/18 09:43:23 markd Exp $
 
 (1)
 Convert install path from fvwm to fvwm2
@@ -7,12 +7,7 @@ CONFIGURE_ARGS+=        --datarootdir=${
 this will install fvwm2/fvwm.
 
 (2)
-Avoid following problem on NetBSD/amd64 with clang
-+-----------------
-| conftest.c:38:3: error: non-void function 'main' should return a value [-Wreturn-type]
-|   return;
-|   ^
-+-----------------
+Fixes for C99 compatibility from Fedora
 
 --- configure.orig     2022-10-20 19:05:33.000000000 +0000
 +++ configure
@@ -34,3 +29,34 @@ Avoid following problem on NetBSD/amd64 
   VERSION='2.7.0'
  
  
+@@ -7643,9 +7643,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ int
+ main (void)
+ {
+-int i; static j; int *p; char *c;
+-  switch (*p = p = *c) { case 0: printf("%Q", c, p); }
+-  *c = &i; c = p;
++int unused; int *p; char *c;
++  printf("%Q", c, p);
+   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
+ 
+   ;
+@@ -13512,7 +13511,7 @@ else $as_nop
+ int
+ main (void)
+ {
+-extern select ($ac_cv_type_fd_set_size_t,
++extern int select ($ac_cv_type_fd_set_size_t,
+  $ac_cv_type_fd_set *,        $ac_cv_type_fd_set *, $ac_cv_type_fd_set *,
+  $ac_type_timeval *);
+   ;
+@@ -13615,6 +13614,9 @@ else $as_nop
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ int main(void)
+ {
+   char template[128];