summaryrefslogtreecommitdiffstats
path: root/source/l/freetype/freetype.this.is.not.a.windows.system.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-03-16 19:00:57 +0000
committer Eric Hameleers <alien@slackware.com>2019-03-17 08:59:46 +0100
commit7016de3d122d1eccdf59100f7afc9e201f16c882 (patch)
tree115ec3da28a4808d644e12497c9f4bd24d790a6b /source/l/freetype/freetype.this.is.not.a.windows.system.diff
parent254920d2af5e61651598f9c07facd3a3fcee17cb (diff)
downloadcurrent-20190316190057.tar.gz
current-20190316190057.tar.xz
Sat Mar 16 19:00:57 UTC 201920190316190057
l/freetype-2.10.0-x86_64-2.txz: Rebuilt. Removed unneeded freetype.this.is.not.a.windows.system.diff.gz patch. Rebased freetype.subpixel.rendering.diff.gz patch. Thanks to Daedra. l/imagemagick-6.9.10_34-x86_64-1.txz: Upgraded. n/NetworkManager-1.16.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/freetype/freetype.this.is.not.a.windows.system.diff')
-rw-r--r--source/l/freetype/freetype.this.is.not.a.windows.system.diff39
1 files changed, 0 insertions, 39 deletions
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
deleted file mode 100644
index af509fd4e..000000000
--- a/source/l/freetype/freetype.this.is.not.a.windows.system.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./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.