CVS commit: pkgsrc/textproc/icu

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 16 13:28:12 UTC 2018

Modified Files:
        pkgsrc/textproc/icu: distinfo
        pkgsrc/textproc/icu/patches: patch-common_uposixdefs.h

Log Message:
icu: Revert previous clang patch, clang was changed instead.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h

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

Modified files:

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.73 pkgsrc/textproc/icu/distinfo:1.74
--- pkgsrc/textproc/icu/distinfo:1.73   Fri Jan 12 12:43:07 2018
+++ pkgsrc/textproc/icu/distinfo        Tue Jan 16 13:28:12 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2018/01/12 12:43:07 jperkin Exp $
+$NetBSD: distinfo,v 1.74 2018/01/16 13:28:12 jperkin Exp $
 
 SHA1 (icu4c-60_2-src.tgz) = 7a099523fcb708b427e94f9b3c372fec3ebd1563
 RMD160 (icu4c-60_2-src.tgz) = e9ef04181123e82d2a846b23caff072e12982b39
@@ -10,7 +10,7 @@ SHA1 (patch-common_putil.cpp) = 6aa70b86
 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
 SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8
-SHA1 (patch-common_uposixdefs.h) = 2de701a171bbb24e4cd814624d3b9f4807a921f8
+SHA1 (patch-common_uposixdefs.h) = a2d7f686d7574a91e04fb771ab26ce5715ade984
 SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199

Index: pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h
diff -u pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h:1.4 pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h:1.5
--- pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h:1.4   Fri Jan 12 12:43:08 2018
+++ pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h       Tue Jan 16 13:28:12 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-common_uposixdefs.h,v 1.4 2018/01/12 12:43:08 jperkin Exp $
+$NetBSD: patch-common_uposixdefs.h,v 1.5 2018/01/16 13:28:12 jperkin Exp $
 
-Don't perform _STDC_C99 workaround with clang.
+C99 and related define overrides.
 
 --- common/uposixdefs.h.orig   2017-03-14 21:01:57.000000000 +0000
 +++ common/uposixdefs.h
@@ -27,12 +27,7 @@ Don't perform _STDC_C99 workaround with 
  
  /**
   * Solaris says:
-@@ -64,8 +68,11 @@
-  *   than a c99 or later compiler."
-  * Apparently C++11 is not "or later". Work around this.
-  */
--#if defined(__cplusplus) && (defined(sun) || defined(__sun)) && !defined (_STDC_C99)
-+#if defined(__cplusplus) && (defined(sun) || defined(__sun)) && !defined (_STDC_C99) && !defined(__clang__)
+@@ -68,4 +72,7 @@
  #   define _STDC_C99
  #endif