summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-09-02 01:43:59 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-09-02 01:43:59 +0000
commitdcb714b87c516f4d489ef4e785a0766e5610cd0f (patch)
treef1ab991475e96de64b84bea794e1a174573fc50f /Build/source/libs
parentdbc46e9b5600c86061b33a0c9dc47321998ab2d3 (diff)
try Nelson's flag for Solaris
git-svn-id: svn://tug.org/texlive/trunk@60398 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/freetype2/TLpatches/ChangeLog1
-rw-r--r--Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag53
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c6
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c6
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c8
5 files changed, 72 insertions, 2 deletions
diff --git a/Build/source/libs/freetype2/TLpatches/ChangeLog b/Build/source/libs/freetype2/TLpatches/ChangeLog
index 7c59330c570..6bed4b990a4 100644
--- a/Build/source/libs/freetype2/TLpatches/ChangeLog
+++ b/Build/source/libs/freetype2/TLpatches/ChangeLog
@@ -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@w32tex.org>
diff --git a/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag b/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
new file mode 100644
index 00000000000..071907766c9
--- /dev/null
+++ b/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
@@ -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@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>
diff --git a/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c b/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
index 359cb075901..2f343778370 100644
--- a/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
+++ b/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
@@ -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 --git a/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c b/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
index 639411543ee..eb0cbcea31c 100644
--- a/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
+++ b/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
@@ -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 --git a/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c b/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
index ab62429787f..ff36d9daaa8 100644
--- a/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
+++ b/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
@@ -28,9 +28,13 @@
/* modified by Werner Lemberg <wl@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>