diff options
| author | schmonz <schmonz@pkgsrc.org> | 2022-11-03 00:00:08 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2022-11-03 00:00:08 +0000 |
| commit | 71e618aa81e7ee38975a04451ca7ee92832d0e39 (patch) | |
| tree | d1015adb0c44d21ae102968b402bc6f876e2dadb /devel | |
| parent | 248d7dd28948fcaff7b0bf6dbe67bd7d5c56246d (diff) | |
| download | pkgsrc-71e618aa81e7ee38975a04451ca7ee92832d0e39.tar.gz | |
Fix macOS build with the 13.0 SDK, which has its own definition of
__deprecated__.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libowfat/distinfo | 5 | ||||
| -rw-r--r-- | devel/libowfat/patches/patch-scan_scan__httpdate.c | 17 | ||||
| -rw-r--r-- | devel/libowfat/patches/patch-scan_scan__iso8601.c | 19 |
3 files changed, 35 insertions, 6 deletions
diff --git a/devel/libowfat/distinfo b/devel/libowfat/distinfo index 57e296583a7..2ff1de68c76 100644 --- a/devel/libowfat/distinfo +++ b/devel/libowfat/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2022/01/23 13:30:32 schmonz Exp $ +$NetBSD: distinfo,v 1.13 2022/11/03 00:00:08 schmonz Exp $ BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b @@ -8,7 +8,8 @@ SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c SHA1 (patch-io_iom__init.c) = 0a8a3ea1809c0661b5692b819b0f616eeb38a1d0 SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e -SHA1 (patch-scan_scan__iso8601.c) = 761d9941e8310d2c56020cee51261d0378530b56 +SHA1 (patch-scan_scan__httpdate.c) = e6e4ddfc82796ac57cc2962d387b96534f8c445b +SHA1 (patch-scan_scan__iso8601.c) = 97690d6dd13f60548a29b3b175dfa1aaf6d0c48e SHA1 (patch-socket_socket__quickack.c) = 85271060a9c0026c264a1aea3006b3d444ddcb8b SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9 SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a diff --git a/devel/libowfat/patches/patch-scan_scan__httpdate.c b/devel/libowfat/patches/patch-scan_scan__httpdate.c new file mode 100644 index 00000000000..da865473c87 --- /dev/null +++ b/devel/libowfat/patches/patch-scan_scan__httpdate.c @@ -0,0 +1,17 @@ +$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 diff --git a/devel/libowfat/patches/patch-scan_scan__iso8601.c b/devel/libowfat/patches/patch-scan_scan__iso8601.c index b7492233beb..4af49affe57 100644 --- a/devel/libowfat/patches/patch-scan_scan__iso8601.c +++ b/devel/libowfat/patches/patch-scan_scan__iso8601.c @@ -1,10 +1,21 @@ -$NetBSD: patch-scan_scan__iso8601.c,v 1.1 2020/06/26 19:21:52 schmonz Exp $ +$NetBSD: patch-scan_scan__iso8601.c,v 1.2 2022/11/03 00:00:08 schmonz Exp $ -Fix Illumos build. +Fix Illumos build. Then fix macOS build with the 13.0 SDK, which has its +own definition of __deprecated__. ---- scan/scan_iso8601.c.orig 2016-04-27 14:07:50.000000000 +0000 +--- scan/scan_iso8601.c.orig 2016-04-27 14:07:50 +++ scan/scan_iso8601.c -@@ -44,7 +44,7 @@ size_t scan_iso8601(const char* in,struc +@@ -4,6 +4,9 @@ + #include "byte.h" + #include "case.h" + #include <time.h> ++#ifdef __APPLE__ ++#undef __deprecated__ ++#endif + #include <stdlib.h> + + #ifdef sgi +@@ -44,7 +47,7 @@ size_t scan_iso8601(const char* in,struct timespec* t) } } |