Thu Nov 3 00:00:08 2022 UTC ()
Fix macOS build with the 13.0 SDK, which has its own definition of
__deprecated__.


(schmonz)
diff -r1.12 -r1.13 pkgsrc/devel/libowfat/distinfo
diff -r0 -r1.1 pkgsrc/devel/libowfat/patches/patch-scan_scan__httpdate.c
diff -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-scan_scan__iso8601.c
cvs diff -r1.12 -r1.13 pkgsrc/devel/libowfat/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libowfat/distinfo 2022/01/23 13:30:32 1.12
+++ pkgsrc/devel/libowfat/distinfo 2022/11/03 00:00:08 1.13
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.12 2022/01/23 13:30:32 schmonz Exp $ 1$NetBSD: distinfo,v 1.13 2022/11/03 00:00:08 schmonz Exp $
2 2
3BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca 3BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca
4SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b 4SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
5Size (libowfat-0.32.tar.xz) = 195820 bytes 5Size (libowfat-0.32.tar.xz) = 195820 bytes
6SHA1 (patch-GNUmakefile) = 5f7cbfd30e151957b18439bb3bacabe17c292d47 6SHA1 (patch-GNUmakefile) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
7SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c 7SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c
8SHA1 (patch-io_iom__init.c) = 0a8a3ea1809c0661b5692b819b0f616eeb38a1d0 8SHA1 (patch-io_iom__init.c) = 0a8a3ea1809c0661b5692b819b0f616eeb38a1d0
9SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc 9SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc
10SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e 10SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e
11SHA1 (patch-scan_scan__iso8601.c) = 761d9941e8310d2c56020cee51261d0378530b56 11SHA1 (patch-scan_scan__httpdate.c) = e6e4ddfc82796ac57cc2962d387b96534f8c445b
 12SHA1 (patch-scan_scan__iso8601.c) = 97690d6dd13f60548a29b3b175dfa1aaf6d0c48e
12SHA1 (patch-socket_socket__quickack.c) = 85271060a9c0026c264a1aea3006b3d444ddcb8b 13SHA1 (patch-socket_socket__quickack.c) = 85271060a9c0026c264a1aea3006b3d444ddcb8b
13SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9 14SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9
14SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a 15SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a
15SHA1 (patch-taia_taia__now__libowfat.3) = 0d9aa54facfc7b26d952a952a431c65b62db95ed 16SHA1 (patch-taia_taia__now__libowfat.3) = 0d9aa54facfc7b26d952a952a431c65b62db95ed
16SHA1 (patch-taia_taia__pack__libowfat.3) = 8298df8d3101a2567ba4933f09b789efe0c2bb7b 17SHA1 (patch-taia_taia__pack__libowfat.3) = 8298df8d3101a2567ba4933f09b789efe0c2bb7b
File Added: pkgsrc/devel/libowfat/patches/patch-scan_scan__httpdate.c
$NetBSD: patch-scan_scan__httpdate.c,v 1.1 2022/11/03 00:00:08 schmonz Exp $

Fix macOS build with the 13.0 SDK, which has its own definition of
__deprecated__.

--- scan/scan_httpdate.c.orig	2016-04-27 14:07:50
+++ scan/scan_httpdate.c
@@ -4,6 +4,9 @@
 #include "byte.h"
 #include "case.h"
 #include <time.h>
+#ifdef __APPLE__
+#undef __deprecated__
+#endif
 #include <stdlib.h>
 
 #ifdef sgi
cvs diff -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-scan_scan__iso8601.c (expand / switch to unified diff)

--- pkgsrc/devel/libowfat/patches/patch-scan_scan__iso8601.c 2020/06/26 19:21:52 1.1
+++ pkgsrc/devel/libowfat/patches/patch-scan_scan__iso8601.c 2022/11/03 00:00:08 1.2
@@ -1,15 +1,26 @@ @@ -1,15 +1,26 @@
1$NetBSD: patch-scan_scan__iso8601.c,v 1.1 2020/06/26 19:21:52 schmonz Exp $ 1$NetBSD: patch-scan_scan__iso8601.c,v 1.2 2022/11/03 00:00:08 schmonz Exp $
2 2
3Fix Illumos build. 3Fix Illumos build. Then fix macOS build with the 13.0 SDK, which has its
 4own definition of __deprecated__.
4 5
5--- scan/scan_iso8601.c.orig 2016-04-27 14:07:50.000000000 +0000 6--- scan/scan_iso8601.c.orig 2016-04-27 14:07:50
6+++ scan/scan_iso8601.c 7+++ scan/scan_iso8601.c
7@@ -44,7 +44,7 @@ size_t scan_iso8601(const char* in,struc 8@@ -4,6 +4,9 @@
 9 #include "byte.h"
 10 #include "case.h"
 11 #include <time.h>
 12+#ifdef __APPLE__
 13+#undef __deprecated__
 14+#endif
 15 #include <stdlib.h>
 16
 17 #ifdef sgi
 18@@ -44,7 +47,7 @@ size_t scan_iso8601(const char* in,struct timespec* t)
8 } 19 }
9 } 20 }
10  21
11-#ifdef __MINGW32__ 22-#ifdef __MINGW32__
12+#if defined(__MINGW32__) || (defined (__sun__) && defined(__svr4__)) 23+#if defined(__MINGW32__) || (defined (__sun__) && defined(__svr4__))
13 x.tm_wday=x.tm_yday=x.tm_isdst=0; 24 x.tm_wday=x.tm_yday=x.tm_isdst=0;
14 #else 25 #else
15 x.tm_wday=x.tm_yday=x.tm_isdst=x.tm_gmtoff=0; 26 x.tm_wday=x.tm_yday=x.tm_isdst=x.tm_gmtoff=0;