Commit de8de1ce0e498b8cc9ae39e5a7d156100bcda99b
2019-02-20T12:48:36
Minor (whitespace, spelling, doc update).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
diff --git a/builds/freetype.mk b/builds/freetype.mk
index fcb5d7e..a9dce0d 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -298,21 +298,22 @@ PIP ?= pip
refdoc:
@echo Running docwriter...
- $(PYTHON) -m docwriter \
- --prefix=ft2 \
- --title=FreeType-$(version) \
- --output=$(DOC_DIR) \
- $(PUBLIC_DIR)/*.h \
- $(PUBLIC_DIR)/config/*.h \
- $(PUBLIC_DIR)/cache/*.h
+ $(PYTHON) -m docwriter \
+ --prefix=ft2 \
+ --title=FreeType-$(version) \
+ --output=$(DOC_DIR) \
+ $(PUBLIC_DIR)/*.h \
+ $(PUBLIC_DIR)/config/*.h \
+ $(PUBLIC_DIR)/cache/*.h
@echo Building static site...
cd $(DOC_DIR) && mkdocs build
@echo Done.
-# Variables for running refdoc with Python's `virtualenv'. The env is
-# created in `DOC_DIR/env' and is gitignored.
-# We still need to cd into `DOC_DIR' to build mkdocs because paths in
-# mkdocs.yml are relative to cwd.
+# Variables for running `refdoc' with Python's `virtualenv'. The
+# environment is created in `DOC_DIR/env' and is gitignored.
+#
+# We still need to cd into `DOC_DIR' to build `mkdocs' because paths in
+# `mkdocs.yml' are relative to the current working directory.
#
VENV_NAME := env
VENV_DIR := $(DOC_DIR)$(SEP)$(VENV_NAME)
@@ -325,13 +326,13 @@ refdoc-venv:
@echo Installing docwriter...
$(ENV_PIP) install docwriter
@echo Running docwriter...
- $(ENV_PYTHON) -m docwriter \
- --prefix=ft2 \
- --title=FreeType-$(version) \
- --output=$(DOC_DIR) \
- $(PUBLIC_DIR)/*.h \
- $(PUBLIC_DIR)/config/*.h \
- $(PUBLIC_DIR)/cache/*.h
+ $(ENV_PYTHON) -m docwriter \
+ --prefix=ft2 \
+ --title=FreeType-$(version) \
+ --output=$(DOC_DIR) \
+ $(PUBLIC_DIR)/*.h \
+ $(PUBLIC_DIR)/config/*.h \
+ $(PUBLIC_DIR)/cache/*.h
@echo Building static site...
cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build
@echo Done.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index e50aad6..ce788d7 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -37,7 +37,7 @@ AC_SUBST(EXEEXT)
PKG_PROG_PKG_CONFIG([0.24])
LT_INIT(win32-dll)
-AC_CHECK_HEADER([windows.h],[LT_PROG_RC])
+AC_CHECK_HEADER([windows.h], [LT_PROG_RC])
# checks for native programs to generate building tool
@@ -196,7 +196,7 @@ AC_SYS_LARGEFILE
AC_ARG_ENABLE([mmap],
AS_HELP_STRING([--disable-mmap],
[do not check mmap() and do not use]),
- [enable_mmap="no"],[enable_mmap="yes"])
+ [enable_mmap="no"], [enable_mmap="yes"])
if test "x${enable_mmap}" != "xno"; then
AC_FUNC_MMAP
fi
@@ -315,7 +315,7 @@ found_visibility_flag=no
AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -fvisibility=hidden"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[found_visibility_flag=yes
AC_MSG_RESULT(yes)],
[CFLAGS="${orig_CFLAGS}"
@@ -325,7 +325,7 @@ if test "${found_visibility_flag}" = "no"; then
AC_MSG_CHECKING([for -xldscope=hidden compiler flag])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -xldscope=hidden"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[found_visibility_flag=yes
AC_MSG_RESULT(yes)],
[CFLAGS="${orig_CFLAGS}"
diff --git a/docs/CHANGES b/docs/CHANGES
index 0938a67..dfb9789 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -79,6 +79,11 @@ CHANGES BETWEEN 2.9.1 and 2.10
functions limited to Adobe MultiMaster fonts to directly set and
get the weight vector.
+ - Support for Position Independent Code as needed by systems that
+ prohibit automatic address fixups, such as BREW, has been
+ removed. [Compilation with modern compilers that use flags like
+ `-fPIC' or `-fPIE' is not affected.]
+
======================================================================
diff --git a/src/psaux/cffdecode.c b/src/psaux/cffdecode.c
index 655e53e..6cc1d32 100644
--- a/src/psaux/cffdecode.c
+++ b/src/psaux/cffdecode.c
@@ -860,7 +860,7 @@
case cff_op_flex1:
case cff_op_callsubr:
case cff_op_callgsubr:
- /* depracated opcodes */
+ /* deprecated opcodes */
case cff_op_dotsection:
/* invalid Type 1 opcodes */
case cff_op_hsbw: