summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/TLpatches
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/TLpatches')
-rw-r--r--Build/source/libs/freetype2/TLpatches/ChangeLog7
-rw-r--r--Build/source/libs/freetype2/TLpatches/TL-Changes2
-rw-r--r--Build/source/libs/freetype2/TLpatches/patch-02-grep36
-rw-r--r--Build/source/libs/freetype2/TLpatches/patch-05-windows-static16
4 files changed, 8 insertions, 53 deletions
diff --git a/Build/source/libs/freetype2/TLpatches/ChangeLog b/Build/source/libs/freetype2/TLpatches/ChangeLog
index 26e7bdef444..8af763bdf24 100644
--- a/Build/source/libs/freetype2/TLpatches/ChangeLog
+++ b/Build/source/libs/freetype2/TLpatches/ChangeLog
@@ -1,3 +1,10 @@
+2023-06-25 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
+
+ Import freetype-2.13.1 source tree from:
+ http://download.savannah.gnu.org/releases/freetype.
+ * patch-02-grep: remove.
+ * patch-05-windows-static: remove.
+
2023-02-11 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
Import freetype-2.13.0 source tree from:
diff --git a/Build/source/libs/freetype2/TLpatches/TL-Changes b/Build/source/libs/freetype2/TLpatches/TL-Changes
index 85f14c65eb9..df5897c6b85 100644
--- a/Build/source/libs/freetype2/TLpatches/TL-Changes
+++ b/Build/source/libs/freetype2/TLpatches/TL-Changes
@@ -1,2 +1,2 @@
-Changes applied to the freetype-2.13.0/ tree as obtained from:
+Changes applied to the freetype-2.13.1/ tree as obtained from:
http://download.savannah.gnu.org/releases/freetype/.
diff --git a/Build/source/libs/freetype2/TLpatches/patch-02-grep b/Build/source/libs/freetype2/TLpatches/patch-02-grep
deleted file mode 100644
index 4a545b28af6..00000000000
--- a/Build/source/libs/freetype2/TLpatches/patch-02-grep
+++ /dev/null
@@ -1,36 +0,0 @@
-grep -E is not supported by system grep on Solaris 5.10.
-But egrep is no longer universally supported either; GNU grep 3.8
-intentionally broke it. So test.
-
---- configure (revision 66134)
-+++ configure (working copy)
-@@ -15,10 +15,19 @@
-
- rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
-
-+if test -z "$EGREP"; then
-+ if echo a | grep -E '(a|b)' >/dev/null 2>&1; then
-+ EGREP="grep -E"
-+ else
-+ # if grep -E doesn't work, assume egrep does.
-+ EGREP=egrep
-+ fi
-+fi
-+
- # respect GNUMAKE environment variable for backward compatibility
- if test "x$GNUMAKE" = x; then
- if test "x$MAKE" = x; then
-- if test "x`make -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
-+ if test "x`make -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
- MAKE=gmake
- else
- MAKE=make
-@@ -28,7 +37,7 @@
- MAKE=$GNUMAKE
- fi
-
--if test "x`$MAKE -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
-+if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
- echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2
- echo "Please try" >&2
- echo >&2
diff --git a/Build/source/libs/freetype2/TLpatches/patch-05-windows-static b/Build/source/libs/freetype2/TLpatches/patch-05-windows-static
deleted file mode 100644
index 65d19606287..00000000000
--- a/Build/source/libs/freetype2/TLpatches/patch-05-windows-static
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur freetype-2.13.0/src/gzip/ftgzip.c freetype-src/src/gzip/ftgzip.c
---- freetype-2.13.0/src/gzip/ftgzip.c Sat Feb 04 23:00:05 2023
-+++ freetype-src/src/gzip/ftgzip.c Sat Feb 11 08:39:27 2023
-@@ -75,6 +75,12 @@
- #define ZEXTERN static
- #endif
-
-+/* In TeX Live, we use the same linking as above for Windows */
-+#if defined( _WIN32 )
-+#define ZEXPORT
-+#define ZEXTERN static
-+#endif
-+
- #define HAVE_MEMCPY 1
- #define Z_SOLO 1
- #define Z_FREETYPE 1