Skip to content

Commit 7dcfdbb

Browse files
committed
Remove T1Lib support (see #69698)
# Also removes imagepscopyfont() which was never available (commented out)
1 parent 0e079f9 commit 7dcfdbb

File tree

6 files changed

+18
-621
lines changed

6 files changed

+18
-621
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107

108108
- GD:
109109
. Made fontFetch's path parser thread-safe. (Sara)
110+
. Removed T1Lib support. (Kalle)
110111

111112
- Fileinfo:
112113
. Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)

UPGRADING

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,23 @@ For more details see https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
645645
. ZLIB_BLOCK
646646
. ZLIB_FINISH
647647

648+
- GD
649+
. T1Lib support removed, thrus lifting the optional dependency on T1Lib, the
650+
following is therefore not available anymore:
651+
652+
Functions:
653+
- imagepsbbox()
654+
- imagepsencodefont()
655+
- imagepsextendedfont()
656+
- imagepsfreefont()
657+
- imagepsloadfont()
658+
- imagepsslantfont()
659+
- imagepstext()
660+
661+
Resources:
662+
- 'gd PS font'
663+
- 'gd PS encoding'
664+
648665
========================================
649666
11. Changes to INI File Handling
650667
========================================

ext/gd/config.m4

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ PHP_ARG_WITH(xpm-dir, for the location of libXpm,
3535
PHP_ARG_WITH(freetype-dir, for FreeType 2,
3636
[ --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix], no, no)
3737

38-
PHP_ARG_WITH(t1lib, for T1lib support,
39-
[ --with-t1lib[=DIR] GD: Include T1lib support. T1lib version >= 5.0.0 required], no, no)
40-
4138
PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD,
4239
[ --enable-gd-native-ttf GD: Enable TrueType string function], no, no)
4340

@@ -209,30 +206,6 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
209206
fi
210207
])
211208

212-
AC_DEFUN([PHP_GD_T1LIB],[
213-
if test "$PHP_T1LIB" != "no"; then
214-
215-
for i in $PHP_T1LIB /usr/local /usr; do
216-
test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
217-
done
218-
219-
if test -z "$GD_T1_DIR"; then
220-
AC_MSG_ERROR([Your t1lib distribution is not installed correctly. Please reinstall it.])
221-
fi
222-
223-
PHP_CHECK_LIBRARY(t1, T1_StrError,
224-
[
225-
AC_DEFINE(HAVE_LIBT1,1,[ ])
226-
PHP_ADD_INCLUDE($GD_T1_DIR/include)
227-
PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
228-
],[
229-
AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
230-
],[
231-
-L$GD_T1_DIR/$PHP_LIBDIR
232-
])
233-
fi
234-
])
235-
236209
AC_DEFUN([PHP_GD_TTSTR],[
237210
if test "$PHP_GD_NATIVE_TTF" = "yes"; then
238211
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
@@ -274,7 +247,6 @@ dnl Various checks for GD features
274247
PHP_GD_PNG
275248
PHP_GD_XPM
276249
PHP_GD_FREETYPE2
277-
PHP_GD_T1LIB
278250
PHP_GD_JISX0208
279251
fi
280252

@@ -343,7 +315,6 @@ dnl Various checks for GD features
343315
PHP_GD_PNG
344316
PHP_GD_XPM
345317
PHP_GD_FREETYPE2
346-
PHP_GD_T1LIB
347318

348319
dnl Header path
349320
for i in include/gd include gd ""; do

ext/gd/config.w32

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// vim:ft=javascript
33

44
ARG_WITH("gd", "Bundled GD support", "yes,shared");
5-
ARG_WITH("t1lib", "t1lib support", "yes");
65
ARG_WITH("libvpx", "vpx support", "yes");
76

87
if (PHP_GD != "no") {
@@ -21,15 +20,6 @@ if (PHP_GD != "no") {
2120
CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
2221
CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11")
2322
) {
24-
if (PHP_T1LIB != "no") {
25-
if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
26-
CHECK_HEADER_ADD_INCLUDE("t1lib.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\t1lib")
27-
) {
28-
ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBT1");
29-
} else {
30-
WARNING("t1lib not enabled; libraries and headers not found");
31-
}
32-
}
3323

3424
if (PHP_LIBVPX != "no") {
3525
if (CHECK_LIB("vpxmt.lib", "gd", PHP_GD) &&

0 commit comments

Comments
 (0)