Sat Feb 6 15:22:58 2021 UTC ()
print/cups-base: avoid duplicate definitions of clock_gettime with Darwin SDK
building against a newer SDK while setting an earlier -macosx-version-min
value can create a conflicting function definition.  This tweak avoids
that conflict while allowing an older compat definition to exist.


(dbj)
diff -r1.25 -r1.26 pkgsrc/print/cups-base/distinfo
diff -r1.2 -r1.3 pkgsrc/print/cups-base/patches/patch-cups_thread.c
cvs diff -r1.25 -r1.26 pkgsrc/print/cups-base/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups-base/distinfo 2021/01/04 14:32:17 1.25
+++ pkgsrc/print/cups-base/distinfo 2021/02/06 15:22:58 1.26
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: distinfo,v 1.25 2021/01/04 14:32:17 prlw1 Exp $ 1$NetBSD: distinfo,v 1.26 2021/02/06 15:22:58 dbj Exp $
2 2
3SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9 3SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9
4RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e 4RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e
5SHA512 (cups-2.3.3op1-source.tar.gz) = 89949b4190288d5464f425cbff6b854e9da96ba3071e4e0d595ad581797b2db4724f49d884f3ea43e372ed4d0faec72839b0b7182cdde13b96f2824d619a4843 5SHA512 (cups-2.3.3op1-source.tar.gz) = 89949b4190288d5464f425cbff6b854e9da96ba3071e4e0d595ad581797b2db4724f49d884f3ea43e372ed4d0faec72839b0b7182cdde13b96f2824d619a4843
6Size (cups-2.3.3op1-source.tar.gz) = 7989156 bytes 6Size (cups-2.3.3op1-source.tar.gz) = 7989156 bytes
7SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 7SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
8SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 8SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
9SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717 9SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717
10SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4 10SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
11SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d 11SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d
12SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b 12SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b
13SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 13SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
14SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a 14SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
15SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e 15SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
16SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67 16SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67
17SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d 17SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d
18SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003 18SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003
19SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2 19SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2
20SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df 20SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
21SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241 21SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241
22SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399 22SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991
23SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 23SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
24SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 24SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821
25SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57 25SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57
26SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a 26SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a
27SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e 27SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e
28SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d 28SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d
29SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc 29SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc
30SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367 30SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-base/patches/patch-cups_thread.c (expand / switch to unified diff)

--- pkgsrc/print/cups-base/patches/patch-cups_thread.c 2020/05/26 08:36:56 1.2
+++ pkgsrc/print/cups-base/patches/patch-cups_thread.c 2021/02/06 15:22:58 1.3
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1$NetBSD: patch-cups_thread.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $ 1$NetBSD: patch-cups_thread.c,v 1.3 2021/02/06 15:22:58 dbj Exp $
2 2
3Patch for macOS Sierra and before. 3Patch for macOS Sierra and before.
4 4
5--- cups/thread.c.orig 2018-06-05 16:06:54.000000000 +0000 5--- cups/thread.c.orig 2020-04-27 11:04:29.000000000 -0700
6+++ cups/thread.c 6+++ cups/thread.c 2020-12-05 18:07:53.000000000 -0800
7@@ -14,6 +14,26 @@ 7@@ -14,6 +14,27 @@
8 #include "cups-private.h" 8 #include "cups-private.h"
9 #include "thread-private.h" 9 #include "thread-private.h"
10  10
11+#if __APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 11+#if __APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200
12+#include <mach/mach_time.h> 12+#include <mach/mach_time.h>
13+#ifndef CLOCK_REALTIME 13+#ifndef CLOCK_REALTIME
14+#define CLOCK_REALTIME 0 14+#define CLOCK_REALTIME 0
15+#define CLOCK_MONOTONIC 0 15+#define CLOCK_MONOTONIC 0
16+#endif 16+#endif
 17+#define clock_gettime cups_thread_static_clock_gettime
17+static int 18+static int
18+clock_gettime(int clk_id, struct timespec *t){ 19+clock_gettime(int clk_id, struct timespec *t){
19+ mach_timebase_info_data_t timebase; 20+ mach_timebase_info_data_t timebase;
20+ mach_timebase_info(&timebase); 21+ mach_timebase_info(&timebase);
21+ uint64_t time; 22+ uint64_t time;
22+ time = mach_absolute_time(); 23+ time = mach_absolute_time();
23+ double nseconds = ((double)time * (double)timebase.numer)/((double)timebase.denom); 24+ double nseconds = ((double)time * (double)timebase.numer)/((double)timebase.denom);
24+ double seconds = ((double)time * (double)timebase.numer)/((double)timebase.denom * 1e9); 25+ double seconds = ((double)time * (double)timebase.numer)/((double)timebase.denom * 1e9);
25+ t->tv_sec = seconds; 26+ t->tv_sec = seconds;
26+ t->tv_nsec = nseconds; 27+ t->tv_nsec = nseconds;
27+ return 0; 28+ return 0;
28+} 29+}
29+#endif 30+#endif