CVS commit: pkgsrc/games/woof

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jan 19 13:02:59 UTC 2024

Modified Files:
        pkgsrc/games/woof: distinfo
Added Files:
        pkgsrc/games/woof/patches: patch-src_hu__lib.c

Log Message:
games/woof: Fix build on SmartOS

[ 25%] Building C object src/CMakeFiles/woof.dir/hu_lib.c.o
/home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/hu_lib.c:54:3: error: conflicting types for 'offset_t'; have 'enum <anonymous>'
   54 | } offset_t;
      |   ^~~~~~~~
In file included from /usr/include/strings.h:32,
                 from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/doomtype.h:60,
                 from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/doomdata.h:26,
                 from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/doomstat.h:30,
                 from /home/pbulk/build/games/woof/work/woof-woof_12.0.2/src/hu_lib.c:20:
/usr/include/sys/types.h:274:25: note: previous declaration of 'offset_t' with type 'offset_t' {aka 'long long int'}
  274 | typedef longlong_t      offset_t;
      |                         ^~~~~~~~
*** [src/CMakeFiles/woof.dir/hu_lib.c.o] Error code 1


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/games/woof/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/woof/patches/patch-src_hu__lib.c

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

Modified files:

Index: pkgsrc/games/woof/distinfo
diff -u pkgsrc/games/woof/distinfo:1.41 pkgsrc/games/woof/distinfo:1.42
--- pkgsrc/games/woof/distinfo:1.41     Wed Jan 17 14:40:51 2024
+++ pkgsrc/games/woof/distinfo  Fri Jan 19 13:02:59 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2024/01/17 14:40:51 micha Exp $
+$NetBSD: distinfo,v 1.42 2024/01/19 13:02:59 micha Exp $
 
 BLAKE2s (woof_12.0.2.tar.gz) = 328dd35ec27edf6a71af458ed9f26723f99379827a5fc0bdac0c3c89d8ff163c
 SHA512 (woof_12.0.2.tar.gz) = f7e2279028b2fb95e37f27e6ecbf988b525bdcc145bce33f201612279d5d5b2b20ff944b802e6d5a95b22281e5301963e4f4d95b50eef5eec39434fe9d71d38a
@@ -7,3 +7,4 @@ SHA1 (patch-data_CMakeLists.txt) = 33eaf
 SHA1 (patch-man_CMakeLists.txt) = d5b2b30eb8a7efeddad29699c47801bc1c865403
 SHA1 (patch-man_WoofInstall.cmake.in) = fbbb75d201d53af8d68eeb29956d793eda465ffb
 SHA1 (patch-src_d__iwad.c) = 88e02974ce6a32be07ca035856c85ebdf97b3ab0
+SHA1 (patch-src_hu__lib.c) = 00e566dcd879b6874a93f2482129e2cc85a29b83

Added files:

Index: pkgsrc/games/woof/patches/patch-src_hu__lib.c
diff -u /dev/null pkgsrc/games/woof/patches/patch-src_hu__lib.c:1.1
--- /dev/null   Fri Jan 19 13:03:00 2024
+++ pkgsrc/games/woof/patches/patch-src_hu__lib.c       Fri Jan 19 13:02:59 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_hu__lib.c,v 1.1 2024/01/19 13:02:59 micha Exp $
+
+Fix namespace clash on SmartOS.
+
+Names with suffix "_t" are reserved for all POSIX headers:
+<https://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_02>
+(Woof indirectly includes "string.h")
+
+--- src/hu_lib.c.orig  2023-12-13 09:45:57.000000000 +0000
++++ src/hu_lib.c
+@@ -51,7 +51,7 @@ typedef enum {
+     offset_bottomright,
+ 
+     num_offsets,
+-} offset_t;
++} woof_offset_type;
+ 
+ static int align_offset[num_offsets];
+