From 7016de3d122d1eccdf59100f7afc9e201f16c882 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 16 Mar 2019 19:00:57 +0000
Subject: Sat Mar 16 19:00:57 UTC 2019

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.
---
 source/l/freetype/freetype.SlackBuild              |  6 +---
 source/l/freetype/freetype.subpixel.rendering.diff | 15 ++++-----
 .../freetype.this.is.not.a.windows.system.diff     | 39 ----------------------
 3 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 source/l/freetype/freetype.this.is.not.a.windows.system.diff

(limited to 'source/l/freetype')

diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild
index 009387887..69f538559 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:-" -j$(expr $(nproc) + 1) "}
 
@@ -95,10 +95,6 @@ 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.subpixel.rendering.diff b/source/l/freetype/freetype.subpixel.rendering.diff
index 5ab3b379a..265d5ba62 100644
--- a/source/l/freetype/freetype.subpixel.rendering.diff
+++ b/source/l/freetype/freetype.subpixel.rendering.diff
@@ -1,12 +1,11 @@
-diff -Naur freetype-2.6.1.orig/include/freetype/config/ftoption.h freetype-2.6.1/include/freetype/config/ftoption.h
---- freetype-2.6.1.orig/include/freetype/config/ftoption.h	2015-09-25 07:58:57.000000000 +0200
-+++ freetype-2.6.1/include/freetype/config/ftoption.h	2015-10-31 16:11:42.016958163 +0100
-@@ -92,7 +92,7 @@
-   /* This is done to allow FreeType clients to run unmodified, forcing     */
-   /* them to display normal gray-level anti-aliased glyphs.                */
-   /*                                                                       */
+--- ./include/freetype/config/ftoption.h.orig	2019-03-16 13:43:22.414319014 -0500
++++ ./include/freetype/config/ftoption.h	2019-03-16 13:44:49.185311833 -0500
+@@ -126,7 +126,7 @@
+    * macro is not defined, FreeType offers alternative LCD rendering
+    * technology that produces excellent output without LCD filtering.
+    */
 -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
 +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
  
  
-   /*************************************************************************/
+   /**************************************************************************
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.
-- 
cgit v1.2.3