CVS commit: pkgsrc/editors/wordtsar

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct  2 06:51:35 UTC 2024

Modified Files:
        pkgsrc/editors/wordtsar: distinfo
Added Files:
        pkgsrc/editors/wordtsar/patches: patch-src_third-party_zip_zip.h

Log Message:
wordtsar: Do not define own ssize_t.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/wordtsar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/wordtsar/patches/patch-src_third-party_zip_zip.h

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

Modified files:

Index: pkgsrc/editors/wordtsar/distinfo
diff -u pkgsrc/editors/wordtsar/distinfo:1.1 pkgsrc/editors/wordtsar/distinfo:1.2
--- pkgsrc/editors/wordtsar/distinfo:1.1        Tue Sep 10 13:58:17 2024
+++ pkgsrc/editors/wordtsar/distinfo    Wed Oct  2 06:51:35 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2024/09/10 13:58:17 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2024/10/02 06:51:35 nia Exp $
 
 BLAKE2s (WordTsar-0.3.719-src.zip) = 7cdcaecdb9310b2821cd5449f88a8e9eaa313afd78f7411c634123252ace876a
 SHA512 (WordTsar-0.3.719-src.zip) = 60ffb855c290f0414160b508c36189489d7b9afed5c2cff36e9d0999ec369849ed3bbf54d4bfbce4aa2852a02df664fa481eb692309befb03eb5b47ec38a4ab5
 Size (WordTsar-0.3.719-src.zip) = 3366105 bytes
+SHA1 (patch-src_third-party_zip_zip.h) = b1109dd61e2a53eea21cea94b3c591021f5f0ffc

Added files:

Index: pkgsrc/editors/wordtsar/patches/patch-src_third-party_zip_zip.h
diff -u /dev/null pkgsrc/editors/wordtsar/patches/patch-src_third-party_zip_zip.h:1.1
--- /dev/null   Wed Oct  2 06:51:35 2024
+++ pkgsrc/editors/wordtsar/patches/patch-src_third-party_zip_zip.h     Wed Oct  2 06:51:35 2024
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_third-party_zip_zip.h,v 1.1 2024/10/02 06:51:35 nia Exp $
+
+Do not perform games with defining our own ssize_t, the compiler
+may decide it's incompatible with the already-defined version.
+
+--- src/third-party/zip/zip.h.orig     2024-10-02 06:48:53.624920629 +0000
++++ src/third-party/zip/zip.h
+@@ -12,6 +12,7 @@
+ #ifndef ZIP_H
+ #define ZIP_H
+ 
++#include <stddef.h>
+ #include <string.h>
+ #include <sys/types.h>
+ 
+@@ -19,18 +20,6 @@
+ extern "C" {
+ #endif
+ 
+-#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) &&               \
+-    !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined)
+-#define _SSIZE_T
+-// 64-bit Windows is the only mainstream platform
+-// where sizeof(long) != sizeof(void*)
+-#ifdef _WIN64
+-typedef long long  ssize_t;  /* byte count or error */
+-#else
+-typedef long  ssize_t;  /* byte count or error */
+-#endif
+-#endif
+-
+ #ifndef MAX_PATH
+ #define MAX_PATH 32767 /* # chars in a path name including NULL */
+ #endif