CVS commit: pkgsrc/print/cups-base

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sat Feb  6 15:22:58 UTC 2021

Modified Files:
        pkgsrc/print/cups-base: distinfo
        pkgsrc/print/cups-base/patches: patch-cups_thread.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/cups-base/patches/patch-cups_thread.c

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

Modified files:

Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.25 pkgsrc/print/cups-base/distinfo:1.26
--- pkgsrc/print/cups-base/distinfo:1.25        Mon Jan  4 14:32:17 2021
+++ pkgsrc/print/cups-base/distinfo     Sat Feb  6 15:22:58 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2021/01/04 14:32:17 prlw1 Exp $
+$NetBSD: distinfo,v 1.26 2021/02/06 15:22:58 dbj Exp $
 
 SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9
 RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e
@@ -19,7 +19,7 @@ SHA1 (patch-config-scripts_cups-gssapi.m
 SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2
 SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
 SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241
-SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399
+SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991
 SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
 SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821
 SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57

Index: pkgsrc/print/cups-base/patches/patch-cups_thread.c
diff -u pkgsrc/print/cups-base/patches/patch-cups_thread.c:1.2 pkgsrc/print/cups-base/patches/patch-cups_thread.c:1.3
--- pkgsrc/print/cups-base/patches/patch-cups_thread.c:1.2      Tue May 26 08:36:56 2020
+++ pkgsrc/print/cups-base/patches/patch-cups_thread.c  Sat Feb  6 15:22:58 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-cups_thread.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
+$NetBSD: patch-cups_thread.c,v 1.3 2021/02/06 15:22:58 dbj Exp $
 
 Patch for macOS Sierra and before.
 
---- cups/thread.c.orig 2018-06-05 16:06:54.000000000 +0000
-+++ cups/thread.c
-@@ -14,6 +14,26 @@
+--- cups/thread.c.orig 2020-04-27 11:04:29.000000000 -0700
++++ cups/thread.c      2020-12-05 18:07:53.000000000 -0800
+@@ -14,6 +14,27 @@
  #include "cups-private.h"
  #include "thread-private.h"
  
@@ -14,6 +14,7 @@ Patch for macOS Sierra and before.
 +#define CLOCK_REALTIME 0
 +#define CLOCK_MONOTONIC 0
 +#endif
++#define clock_gettime cups_thread_static_clock_gettime
 +static int
 +clock_gettime(int clk_id, struct timespec *t){
 +    mach_timebase_info_data_t timebase;