texlive[60398] Build/source/libs/freetype2: try Nelson's flag for

[commits+kakuto at tug.org]

Revision: 60398
          http://tug.org/svn/texlive?view=revision&revision=60398
Author:   kakuto
Date:     2021-09-02 03:43:59 +0200 (Thu, 02 Sep 2021)
Log Message:
-----------
try Nelson's flag for Solaris

Modified Paths:
--------------
    trunk/Build/source/libs/freetype2/TLpatches/ChangeLog
    trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
    trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
    trunk/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c

Added Paths:
-----------
    trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag

Modified: trunk/Build/source/libs/freetype2/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/freetype2/TLpatches/ChangeLog	2021-09-01 23:49:24 UTC (rev 60397)
+++ trunk/Build/source/libs/freetype2/TLpatches/ChangeLog	2021-09-02 01:43:59 UTC (rev 60398)
@@ -3,6 +3,7 @@
 	Imported freetype-2.11.0 source tree from:
 	  http://download.savannah.gnu.org/releases/freetype.
 	Add patch-01-support-old-compilers.
+	Add patch-02-try-Nelson-flag.
 
 2020-10-21  Akira Kakuto  <kakuto at w32tex.org>
 

Added: trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
===================================================================
--- trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag	                        (rev 0)
+++ trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag	2021-09-02 01:43:59 UTC (rev 60398)
@@ -0,0 +1,53 @@
+diff -ur freetype-2.11.0/src/dlg/dlg.c freetype-src/src/dlg/dlg.c
+--- freetype-2.11.0/src/dlg/dlg.c	Tue Jul 20 01:08:21 2021
++++ freetype-src/src/dlg/dlg.c	Thu Sep 02 10:32:31 2021
+@@ -2,7 +2,13 @@
+ // Distributed under the Boost Software License, Version 1.0.
+ // See accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt
+ 
++/* Try Nelson's flag */
++#if defined(__sun)
++#define _XOPEN_SOURCE 600
++#define _XPG6
++#else
+ #define _XOPEN_SOURCE
++#endif
+ #define _POSIX_C_SOURCE 200809L
+ #define _WIN32_WINNT 0x0600
+ 
+diff -ur freetype-2.11.0/src/dlg/dlgwrap.c freetype-src/src/dlg/dlgwrap.c
+--- freetype-2.11.0/src/dlg/dlgwrap.c	Sat Feb 13 17:16:54 2021
++++ freetype-src/src/dlg/dlgwrap.c	Thu Sep 02 10:32:53 2021
+@@ -18,7 +18,13 @@
+ 
+   /* We have to duplicate these feature test macros from `dlg.c` */
+   /* since `freetype.h` loads some affected standard headers.    */
++/* Try Nelson's flag */
++#if defined(__sun)
++#define _XOPEN_SOURCE 600
++#define _XPG6
++#else
+ #define _XOPEN_SOURCE
++#endif
+ #define _POSIX_C_SOURCE 200809L
+ 
+ #include <freetype/freetype.h>
+diff -ur freetype-2.11.0/src/tools/ftrandom/ftrandom.c freetype-src/src/tools/ftrandom/ftrandom.c
+--- freetype-2.11.0/src/tools/ftrandom/ftrandom.c	Thu Aug 27 15:17:20 2020
++++ freetype-src/src/tools/ftrandom/ftrandom.c	Thu Sep 02 10:28:03 2021
+@@ -28,9 +28,13 @@
+ /* modified by Werner Lemberg <wl at gnu.org>       */
+ /* This file is now part of the FreeType library */
+ 
+-
++/* Try Nelson's flag in Solaris */
++#if defined(__sun)
++#define _XOPEN_SOURCE 600
++#define _XPG6
++#else
+ #define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */
+-
++#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>

Modified: trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
===================================================================
--- trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c	2021-09-01 23:49:24 UTC (rev 60397)
+++ trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c	2021-09-02 01:43:59 UTC (rev 60398)
@@ -2,7 +2,13 @@
 // Distributed under the Boost Software License, Version 1.0.
 // See accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt
 
+/* Try Nelson's flag */
+#if defined(__sun)
+#define _XOPEN_SOURCE 600
+#define _XPG6
+#else
 #define _XOPEN_SOURCE
+#endif
 #define _POSIX_C_SOURCE 200809L
 #define _WIN32_WINNT 0x0600
 

Modified: trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
===================================================================
--- trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c	2021-09-01 23:49:24 UTC (rev 60397)
+++ trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c	2021-09-02 01:43:59 UTC (rev 60398)
@@ -18,7 +18,13 @@
 
   /* We have to duplicate these feature test macros from `dlg.c` */
   /* since `freetype.h` loads some affected standard headers.    */
+/* Try Nelson's flag */
+#if defined(__sun)
+#define _XOPEN_SOURCE 600
+#define _XPG6
+#else
 #define _XOPEN_SOURCE
+#endif
 #define _POSIX_C_SOURCE 200809L
 
 #include <freetype/freetype.h>

Modified: trunk/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
===================================================================
--- trunk/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c	2021-09-01 23:49:24 UTC (rev 60397)
+++ trunk/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c	2021-09-02 01:43:59 UTC (rev 60398)
@@ -28,10 +28,14 @@
 /* modified by Werner Lemberg <wl at gnu.org>       */
 /* This file is now part of the FreeType library */
 
-
+/* Try Nelson's flag in Solaris */
+#if defined(__sun)
+#define _XOPEN_SOURCE 600
+#define _XPG6
+#else
 #define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */
+#endif
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>