diff options
Diffstat (limited to 'source/l/freetype')
| -rwxr-xr-x | source/l/freetype/freetype.SlackBuild | 6 | ||||
| -rw-r--r-- | source/l/freetype/freetype.this.is.not.a.windows.system.diff | 39 |
2 files changed, 44 insertions, 1 deletions
diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 2adce0b55..39ffbca96 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freetype VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -95,6 +95,10 @@ zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1 --verbose || exit 1 # scripts in /etc/profile.d/. zcat $CWD/freetype.compile.both.subpixel.hinting.methods.diff.gz | patch -p1 --verbose || exit 1 +# Just because we have the windres utility does not mean we are compiling +# on a Windows system: +zcat $CWD/freetype.this.is.not.a.windows.system.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . CFLAGS="$SLKCFLAGS" \ diff --git a/source/l/freetype/freetype.this.is.not.a.windows.system.diff b/source/l/freetype/freetype.this.is.not.a.windows.system.diff new file mode 100644 index 000000000..af509fd4e --- /dev/null +++ b/source/l/freetype/freetype.this.is.not.a.windows.system.diff @@ -0,0 +1,39 @@ +--- ./builds/freetype.mk.orig 2018-04-22 04:41:36.000000000 -0500 ++++ ./builds/freetype.mk 2018-09-13 14:34:39.641002962 -0500 +@@ -248,20 +248,24 @@ + $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) + + +-# ftver component ++# COMMENTED OUT: ++# Otherwise having windres on the system causes a Windows-specific resource ++# file to be compiled, breaking the build. + # +-# The VERSIONINFO resource `ftver.rc' contains version and copyright +-# to be compiled by windres and tagged into DLL usually. ++## ftver component ++## ++## The VERSIONINFO resource `ftver.rc' contains version and copyright ++## to be compiled by windres and tagged into DLL usually. ++## ++#ifneq ($(RC),) ++# FTVER_SRC := $(BASE_DIR)/ftver.rc ++# FTVER_OBJ := $(OBJ_DIR)/ftver.$O + # +-ifneq ($(RC),) +- FTVER_SRC := $(BASE_DIR)/ftver.rc +- FTVER_OBJ := $(OBJ_DIR)/ftver.$O +- +- OBJECTS_LIST += $(FTVER_OBJ) +- +- $(FTVER_OBJ): $(FTVER_SRC) +- $(RC) -o $@ $< +-endif ++# OBJECTS_LIST += $(FTVER_OBJ) ++# ++# $(FTVER_OBJ): $(FTVER_SRC) ++# $(RC) -o $@ $< ++#endif + + + # All FreeType library objects. |