summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2016-07-15 09:14:50 +0200
committerJan Alexander Steffens (heftig)2016-07-15 09:14:57 +0200
commit4a6d1b899f7c686867bcd3f29530d27aff23f7c7 (patch)
tree4f14a0b0b439d651ec4d55c112b35124dda04726
parent81b6945d4a11aff2bf074a3cbd6d81c85d136941 (diff)
downloadaur-4a6d1b899f7c686867bcd3f29530d27aff23f7c7.tar.gz
Sync with freetype2
But keep subpixel hinting on by default.
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Enable-table-validation-modules.patch6
-rw-r--r--0002-Enable-subpixel-rendering.patch8
-rw-r--r--0003-Make-subpixel-hinting-mode-configurable.patch20
-rw-r--r--PKGBUILD8
5 files changed, 26 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8eed1c9046f..08656bc6ff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Jul 12 11:36:23 UTC 2016
+# Fri Jul 15 07:14:37 UTC 2016
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6.4+p12+g605946a
+ pkgver = 2.6.5+p11+gff65543
pkgrel = 1
epoch = 1
url = http://www.freetype.org/
@@ -19,7 +19,7 @@ pkgbase = freetype2-git
depends = libpng
depends = harfbuzz
provides = libfreetype.so
- provides = freetype2=2.6.4+p12+g605946a
+ provides = freetype2=2.6.5+p11+gff65543
conflicts = freetype2
source = git://git.sv.gnu.org/freetype/freetype2.git
source = git://git.sv.gnu.org/freetype/freetype2-demos.git
@@ -28,9 +28,9 @@ pkgbase = freetype2-git
source = 0003-Make-subpixel-hinting-mode-configurable.patch
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = 045b1b6a56151ab46a8300e6fd09f24294258e97
- sha1sums = afd6f9504516fa02e57890dde820f488e0df36bb
- sha1sums = 2a1d6e734001e196c7a7790c78165d9b9fe49f7f
+ sha1sums = e1fde7854d2a64868a5eef07415ad23c339fc630
+ sha1sums = 7da3af8e1e002e39a247c37a05a10beb576007d6
+ sha1sums = c64ba9d37732fc75de7817d1d679a3e38efdb4cb
pkgname = freetype2-git
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index e4c425c01e6..55288708b19 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,7 +1,7 @@
-From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001
+From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/3] Enable table validation modules
+Subject: [PATCH 1/4] Enable table validation modules
---
modules.cfg | 4 ++--
@@ -30,5 +30,5 @@ index d677565a2bc2b5a2..f19cbec33384a86f 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.8.3
+2.9.0
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index d2747bfdad4..d70b4f0e2cf 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,14 +1,14 @@
-From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001
+From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/3] Enable subpixel rendering
+Subject: [PATCH 2/4] Enable subpixel rendering
---
include/freetype/config/ftoption.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 7dd3f55e572a23b9..33d563c4e1e47228 100644
+index 2556c64d9d6c0838..8e58403529f597e5 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
@@ -21,5 +21,5 @@ index 7dd3f55e572a23b9..33d563c4e1e47228 100644
/*************************************************************************/
--
-2.8.3
+2.9.0
diff --git a/0003-Make-subpixel-hinting-mode-configurable.patch b/0003-Make-subpixel-hinting-mode-configurable.patch
index df1edcfe1b7..c1441dbef1d 100644
--- a/0003-Make-subpixel-hinting-mode-configurable.patch
+++ b/0003-Make-subpixel-hinting-mode-configurable.patch
@@ -1,24 +1,22 @@
-From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001
+From be997becc28dfbf2077cca55dc9a6a090d13e22a Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 15 Jun 2016 14:10:20 +0200
-Subject: [PATCH 3/3] Make subpixel hinting mode configurable
+Subject: [PATCH 3/4] Make subpixel hinting mode configurable
---
- include/freetype/config/ftoption.h | 4 ++--
+ include/freetype/config/ftoption.h | 2 +-
src/truetype/ttobjs.c | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 39 insertions(+), 2 deletions(-)
+ 2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 33d563c4e1e47228..a401fc8e9efbbd79 100644
+index 8e58403529f597e5..197e15cdc3cc1e74 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -631,8 +631,8 @@ FT_BEGIN_HEADER
- /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+@@ -632,7 +632,7 @@ FT_BEGIN_HEADER
/* */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+ /* #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 )
@@ -86,5 +84,5 @@ index ed3be2dbee79427c..d89f92e94d0e816b 100644
FT_UNUSED( ttdriver );
--
-2.8.3
+2.9.0
diff --git a/PKGBUILD b/PKGBUILD
index afc9dc4bc2e..8ede139969c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=freetype2-git
epoch=1
-pkgver=2.6.4+p12+g605946a
+pkgver=2.6.5+p11+gff65543
pkgrel=1
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
@@ -23,9 +23,9 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
0003-Make-subpixel-hinting-mode-configurable.patch)
sha1sums=('SKIP'
'SKIP'
- '045b1b6a56151ab46a8300e6fd09f24294258e97'
- 'afd6f9504516fa02e57890dde820f488e0df36bb'
- '2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
+ 'e1fde7854d2a64868a5eef07415ad23c339fc630'
+ '7da3af8e1e002e39a247c37a05a10beb576007d6'
+ 'c64ba9d37732fc75de7817d1d679a3e38efdb4cb')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
prepare() {