From 0c1b063a4ebb12cde8b8badfbc632f1821bc1e1b Mon Sep 17 00:00:00 2001
From: andry-dev <peketribal2@gmail.com>
Date: Thu, 30 Jul 2020 22:24:53 +0000
Subject: [PATCH 1/2] freetype: move ClearType patch to a build option

---
 .../freetype/patches/enable-subpixel-rendering.patch  | 11 -----------
 srcpkgs/freetype/template                             | 11 ++++++++++-
 2 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/freetype/patches/enable-subpixel-rendering.patch

diff --git a/srcpkgs/freetype/patches/enable-subpixel-rendering.patch b/srcpkgs/freetype/patches/enable-subpixel-rendering.patch
deleted file mode 100644
index 5cba955ca2c..00000000000
--- a/srcpkgs/freetype/patches/enable-subpixel-rendering.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/freetype/config/ftoption.h
-+++ include/freetype/config/ftoption.h
-@@ -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/srcpkgs/freetype/template b/srcpkgs/freetype/template
index f279908c442..fa0fe0afb6a 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
 version=2.10.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -12,6 +12,15 @@ license="GPL-2.0-or-later, FTL"
 homepage="https://www.freetype.org/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b
+build_options="cleartype"
+desc_option_cleartype="Enable Microsoft's subpixel rendering (ClearType)"
+build_options_default="cleartype"
+
+pre_build() {
+	if [ yes = "$(vopt_if cleartype yes)" ]; then
+		vsed -i ${wrksrc}/include/freetype/config/ftoption.h -e 's@/\* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING \*/@#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING@'
+	fi
+}
 
 post_install() {
 	vlicense docs/LICENSE.TXT docs/FTL.TXT

From b3b494b6493c17833a94918eb77fbbe733696a4b Mon Sep 17 00:00:00 2001
From: andry-dev <peketribal2@gmail.com>
Date: Thu, 30 Jul 2020 22:30:33 +0000
Subject: [PATCH 2/2] fontconfig: set lcdfilter by default

---
 .../files/11-lcdfilter-default.conf           | 21 +++++++++++++++++++
 srcpkgs/fontconfig/template                   |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/fontconfig/files/11-lcdfilter-default.conf

diff --git a/srcpkgs/fontconfig/files/11-lcdfilter-default.conf b/srcpkgs/fontconfig/files/11-lcdfilter-default.conf
new file mode 100644
index 00000000000..712d141d068
--- /dev/null
+++ b/srcpkgs/fontconfig/files/11-lcdfilter-default.conf
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcddefault as default for LCD filter</description>
+<!--  Use lcddefault as default for LCD filter -->
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit mode="append" name="lcdfilter">
+      <const>lcddefault</const>
+    </edit>
+  </match>
+</fontconfig> 
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 18504e4503f..12284db10a3 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'fontconfig'
 pkgname=fontconfig
 version=2.13.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
 hostmakedepends="gperf pkg-config"
@@ -23,6 +23,8 @@ post_install() {
 	if [ "$CROSS_BUILD" ]; then
 		sed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
 	fi
+	vinstall ${FILESDIR}/11-lcdfilter-default.conf 644 usr/share/fontconfig/conf.avail
+	ln -s /usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf ${DESTDIR}/etc/fonts/conf.d/
 	vlicense COPYING
 }