From bfb16ac9b7e9b5e8693d4d2d2381dee00ca0c36f Mon Sep 17 00:00:00 2001 From: Mojca Miklavec Date: Tue, 7 Sep 2021 19:16:50 +0000 Subject: simplify freetype patches for Solaris git-svn-id: svn://tug.org/texlive/trunk@60447 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/freetype2/TLpatches/ChangeLog | 4 +++ .../freetype2/TLpatches/patch-02-try-Nelson-flag | 35 ++++++---------------- .../libs/freetype2/freetype-src/src/dlg/dlg.c | 6 ---- .../libs/freetype2/freetype-src/src/dlg/dlgwrap.c | 6 ---- .../freetype-src/src/tools/ftrandom/ftrandom.c | 10 ++----- 5 files changed, 16 insertions(+), 45 deletions(-) (limited to 'Build/source/libs') diff --git a/Build/source/libs/freetype2/TLpatches/ChangeLog b/Build/source/libs/freetype2/TLpatches/ChangeLog index 6bed4b990a4..bd26dd5638e 100644 --- a/Build/source/libs/freetype2/TLpatches/ChangeLog +++ b/Build/source/libs/freetype2/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2021-09-07 Mojca Miklavec + + Simplified patches for Solaris (fixed upstream). + 2021-09-01 Akira Kakuto Imported freetype-2.11.0 source tree from: diff --git a/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag b/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag index 071907766c9..98e233ae602 100644 --- a/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag +++ b/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag @@ -1,53 +1,36 @@ 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 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 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 */ +@@ -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 - #include 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 2f343778370..0e6bc74b6cc 100644 --- a/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c +++ b/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c @@ -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 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 eb0cbcea31c..5b2006c1260 100644 --- a/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c +++ b/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c @@ -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 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 ff36d9daaa8..4f912cd21d6 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,13 +28,9 @@ /* modified by Werner Lemberg */ /* 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 #include -- cgit v1.2.3