texlive[60447] Build/source/libs/freetype2: simplify freetype patches

[commits+mojca at tug.org]

Revision: 60447
          http://tug.org/svn/texlive?view=revision&revision=60447
Author:   mojca
Date:     2021-09-07 21:16:50 +0200 (Tue, 07 Sep 2021)
Log Message:
-----------
simplify freetype patches for Solaris

Modified Paths:
--------------
    trunk/Build/source/libs/freetype2/TLpatches/ChangeLog
    trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
    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

Modified: trunk/Build/source/libs/freetype2/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/freetype2/TLpatches/ChangeLog	2021-09-06 23:48:09 UTC (rev 60446)
+++ trunk/Build/source/libs/freetype2/TLpatches/ChangeLog	2021-09-07 19:16:50 UTC (rev 60447)
@@ -1,3 +1,7 @@
+2021-09-07  Mojca Miklavec  <mojca.miklavec.lists at gmail.com>
+
+	Simplified patches for Solaris (fixed upstream).
+
 2021-09-01  Akira Kakuto  <kakuto at jcom.zaq.ne.jp>
 
 	Imported freetype-2.11.0 source tree from:

Modified: trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
===================================================================
--- trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag	2021-09-06 23:48:09 UTC (rev 60446)
+++ trunk/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag	2021-09-07 19:16:50 UTC (rev 60447)
@@ -1,17 +1,12 @@
 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 @@
+@@ -2,7 +2,7 @@
  // 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
 +#define _XOPEN_SOURCE 600
-+#define _XPG6
-+#else
- #define _XOPEN_SOURCE
-+#endif
  #define _POSIX_C_SOURCE 200809L
  #define _WIN32_WINNT 0x0600
  
@@ -18,17 +13,12 @@
 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 @@
+@@ -18,7 +18,7 @@
  
    /* 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
 +#define _XOPEN_SOURCE 600
-+#define _XPG6
-+#else
- #define _XOPEN_SOURCE
-+#endif
  #define _POSIX_C_SOURCE 200809L
  
  #include <freetype/freetype.h>
@@ -35,19 +25,12 @@
 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>       */
+@@ -29,7 +29,7 @@
  /* 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
  
+-#define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */
++#define _XOPEN_SOURCE 600 /* for `kill', `strdup', `random', and `srandom' */
+ 
+ 
  #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-06 23:48:09 UTC (rev 60446)
+++ trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c	2021-09-07 19:16:50 UTC (rev 60447)
@@ -2,13 +2,7 @@
 // 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-06 23:48:09 UTC (rev 60446)
+++ trunk/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c	2021-09-07 19:16:50 UTC (rev 60447)
@@ -18,13 +18,7 @@
 
   /* 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-06 23:48:09 UTC (rev 60446)
+++ trunk/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c	2021-09-07 19:16:50 UTC (rev 60447)
@@ -28,14 +28,10 @@
 /* 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
 
+#define _XOPEN_SOURCE 600 /* for `kill', `strdup', `random', and `srandom' */
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>