summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Enable-table-validation-modules.patch16
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch20
-rw-r--r--0003-Enable-long-PCF-family-names.patch20
-rw-r--r--0007-cleartype.patch14
-rw-r--r--PKGBUILD27
5 files changed, 47 insertions, 50 deletions
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index b492755d99bd..2c38e8f5b665 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001
-Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001
+Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200
Subject: [PATCH 1/4] Enable table validation modules
@@ -9,42 +9,38 @@ Subject: [PATCH 1/4] Enable table validation modules
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index 4bf344524..f9aa44b2a 100644
+index dc6c8d42d..2ab145016 100644
--- a/modules.cfg
+++ b/modules.cfg
-@@ -120,30 +120,30 @@ AUX_MODULES += cache
+@@ -111,26 +111,26 @@ AUX_MODULES += cache
+
# TrueType GX/AAT table validation. Needs `ftgxval.c' below.
#
- # No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz).
#
# See include/freetype/ftgzip.h for the API.
- # No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += gzip
# Support for streams compressed with LZW (files with suffix .Z).
#
# See include/freetype/ftlzw.h for the API.
- # No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += lzw
# Support for streams compressed with bzip2 (files with suffix .bz2).
#
# See include/freetype/ftbzip2.h for the API.
- # No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += bzip2
# OpenType table validation. Needs `ftotval.c' below.
#
- # No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
# Auxiliary PostScript driver component to share common code.
#
--
-2.17.0
+2.21.0
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 461f8e91cdd7..22a19a6463ee 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001
-Message-Id: <ecb052d87dd80603aac454a65fd6e074bc57772c.1525259379.git.jan.steffens@gmail.com>
-In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
-References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001
+Message-Id: <fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2.1552648361.git.jan.steffens@gmail.com>
+In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 29 Aug 2016 08:43:10 +0200
Subject: [PATCH 2/4] Enable infinality subpixel hinting
@@ -11,20 +11,20 @@ Subject: [PATCH 2/4] Enable infinality subpixel hinting
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 4bcab2af5..862b926d5 100644
+index 12f47a82e..1d4469a99 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
- /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
- /* */
+ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+ */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
- /*************************************************************************/
+ /**************************************************************************
--
-2.17.0
+2.21.0
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 38623e369271..916fe9cf141f 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,7 @@
-From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001
-Message-Id: <bbb386e90cf9440c9c9952aa14bc309f2ec76205.1525259379.git.jan.steffens@gmail.com>
-In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
-References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001
+Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com>
+In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sun, 14 May 2017 18:09:31 +0200
Subject: [PATCH 3/4] Enable long PCF family names
@@ -11,18 +11,18 @@ Subject: [PATCH 3/4] Enable long PCF family names
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 862b926d5..bd6a4f7d3 100644
+index 1d4469a99..4ff4e7821 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -849,7 +849,7 @@ FT_BEGIN_HEADER
- /* If this option is activated, it can be controlled with the */
- /* `no-long-family-names' property of the pcf driver module. */
- /* */
+@@ -847,7 +847,7 @@ FT_BEGIN_HEADER
+ * If this option is activated, it can be controlled with the
+ * `no-long-family-names` property of the 'pcf' driver module.
+ */
-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
/*************************************************************************/
--
-2.17.0
+2.21.0
diff --git a/0007-cleartype.patch b/0007-cleartype.patch
index 596c6a9f2cad..4d516983ff1c 100644
--- a/0007-cleartype.patch
+++ b/0007-cleartype.patch
@@ -1,11 +1,11 @@
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,7 @@
- /* rendering technology that produces excellent output without LCD */
- /* filtering. */
- /* */
+@@ -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/PKGBUILD b/PKGBUILD
index ea1326f7d9d7..7aaddbb87031 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani@gmail.com>
+# Maintainer: Jaden Peterson <jadenpeterson150@gmail.com>
+# Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani@gmail.com>
# Contributor: jeckhack <jeckhack/gmail/com>
# Contributor: Marcin (CTRL) Wieczorek <marcin@marcin.co>
# Contributor: frames <markkuehn at outlook dot com>
@@ -9,32 +10,32 @@
# Contributor: freedom
pkgname=freetype2-cleartype
-pkgver=2.9.1
+pkgver=2.10.0
pkgrel=1
pkgdesc="Font rasterization library with ClearType patch"
arch=(x86_64)
license=('GPL')
url="https://www.freetype.org/"
- # adding harfbuzz for improved OpenType features auto-hinting
- # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
makedepends=('libx11')
conflicts=('freetype2')
provides=('freetype2' 'libfreetype.so')
backup=('etc/profile.d/freetype2.sh')
+install=freetype2.install
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
0001-Enable-table-validation-modules.patch
0002-Enable-infinality-subpixel-hinting.patch
0003-Enable-long-PCF-family-names.patch
0007-cleartype.patch
- freetype2.sh
-)
-sha1sums=('220c82062171c513e4017c523d196933c9de4a7d'
+ freetype2.sh)
+sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5'
'SKIP'
- 'd9eb22e5c962923089b0c9fc5491cf28a19bd982'
- 'd13503902e0404cf3558db76b477f23f9910d06e'
- 'fc49742fb6c19fe0677e3552bb7c00aac8530265'
- '60f26c740ac53c684703ef401a481659a7364ff4'
+ '46fd67e6a594f6c2c473b9321ba64913984ba42f'
+ '4bf0c0749db09878b918cc404300f0d3e9091607'
+ 'af76172be8135e74391b7ad1b82c2124ae0ad86c'
+ '769ee34c98e78d1e6182476704ddec85f92da394'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -45,7 +46,7 @@ prepare() {
patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
# Enable ClearType
- patch -Np1 -i ../0007-cleartype.patch
+ #patch -Np1 -i ../0007-cleartype.patch
}
build() {
@@ -62,5 +63,5 @@ check() {
package() {
cd freetype-${pkgver}
make DESTDIR="${pkgdir}" install
- install -Dm644 ../freetype2.sh -t "${pkgdir}"/etc/profile.d -m644
+ install -Dt "${pkgdir}/etc/profile.d" -m644 ../freetype2.sh
}