summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Enable-table-validation-modules.patch6
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch26
-rw-r--r--0003-Enable-long-PCF-family-names.patch25
-rw-r--r--0004-Enable-old-engines-but-keep-adobe-as-default.patch44
-rw-r--r--PKGBUILD10
6 files changed, 62 insertions, 65 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ba48f80cb600..56f3b5557dbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.9.1+p2+g660afb5ce
+ pkgver = 2.9.1+p47+gf999375a9
pkgrel = 1
epoch = 1
url = https://www.freetype.org/
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = c8fc59c8279cef310a517d2add6ef14e70e87a61
- sha1sums = 9c58d84ad7c46d28d94f42aa9839adc8469e0e12
- sha1sums = 0cd35ca8c395c642f14068cea72f909aee6dd86d
- sha1sums = 86733121fdb5b6c88fe6fa47a7b4f8fe04c63ba2
+ sha1sums = cc84900f1a6f8f1a34b99034dd9f9b074784fc3e
+ sha1sums = 9e6998d19e9cc78a6a796e284d8d3089813fb5b3
+ sha1sums = a84a23baf95b844a7b4555e9d436708718967cb1
+ sha1sums = f5cd2a12969f26b4c30313a756e567cb57efebc7
sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.9.1+p2+g660afb5ce
+ provides = freetype2=2.9.1+p47+gf999375a9
conflicts = freetype2
backup = etc/profile.d/freetype2.sh
@@ -44,12 +44,12 @@ pkgname = freetype2-demos-git
pkgdesc = Freetype tools and demos (from git)
depends = freetype2-git
depends = libx11
- provides = freetype2-demos=2.9.1+p2+g660afb5ce
+ provides = freetype2-demos=2.9.1+p47+gf999375a9
conflicts = freetype2-demos
pkgname = freetype2-docs-git
pkgdesc = Freetype documentation (from git)
depends = freetype2-git
- provides = freetype2-docs=2.9.1+p2+g660afb5ce
+ provides = freetype2-docs=2.9.1+p47+gf999375a9
conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 7ec8e34fda2d..b7fe83153e22 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From 56649dbc4d1c78fc2253e4b54f781f603f6eb332 Mon Sep 17 00:00:00 2001
-Message-Id: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
+From 5c07abe9d2d676c3c19a15bf41d1c2ea75428895 Mon Sep 17 00:00:00 2001
+Message-Id: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.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
@@ -42,5 +42,5 @@ index c46e61963..4618c8af3 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.17.0
+2.17.1
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index b8cae8ef5b8c..8011edd3ef22 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-From c379d9d5f00fbf231f16cf728ae79edd8fd5e515 Mon Sep 17 00:00:00 2001
-Message-Id: <c379d9d5f00fbf231f16cf728ae79edd8fd5e515.1525322178.git.jan.steffens@gmail.com>
-In-Reply-To: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
-References: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
+From 0a0bfefd08c6793c0a50fd9d7b106f97a50bf525 Mon Sep 17 00:00:00 2001
+Message-Id: <0a0bfefd08c6793c0a50fd9d7b106f97a50bf525.1528073963.git.jan.steffens@gmail.com>
+In-Reply-To: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.git.jan.steffens@gmail.com>
+References: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.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 1cf694668..c25285b38 100644
+index c030a88cd..30aac1366 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -629,8 +629,8 @@ FT_BEGIN_HEADER
- /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
- /* */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+@@ -638,8 +638,8 @@ FT_BEGIN_HEADER
+ * [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+ *
+ */
-#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 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
- /*************************************************************************/
+ /**************************************************************************
--
-2.17.0
+2.17.1
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 840e576d60d8..711158ef75de 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,28 +1,27 @@
-From 2df1ed02054185df45ee3d1a63c91ef678e470f1 Mon Sep 17 00:00:00 2001
-Message-Id: <2df1ed02054185df45ee3d1a63c91ef678e470f1.1525322178.git.jan.steffens@gmail.com>
-In-Reply-To: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
-References: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
+From a1de19f4438c7b181e1c890f309029f8fd99675a Mon Sep 17 00:00:00 2001
+Message-Id: <a1de19f4438c7b181e1c890f309029f8fd99675a.1528073963.git.jan.steffens@gmail.com>
+In-Reply-To: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.git.jan.steffens@gmail.com>
+References: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.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
---
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ include/freetype/config/ftoption.h | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index c25285b38..438d0614b 100644
+index 30aac1366..227790fd9 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -820,7 +820,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 */
+@@ -830,6 +830,7 @@ FT_BEGIN_HEADER
+ * `no-long-family-names' property of the pcf driver module.
+ *
+ */
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
/*************************************************************************/
--
-2.17.0
+2.17.1
diff --git a/0004-Enable-old-engines-but-keep-adobe-as-default.patch b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
index 256df971d873..bd3129c075e7 100644
--- a/0004-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -1,42 +1,40 @@
-From 66a1ee9d22b77445051d64d008e7c7faced04a09 Mon Sep 17 00:00:00 2001
-Message-Id: <66a1ee9d22b77445051d64d008e7c7faced04a09.1525322178.git.jan.steffens@gmail.com>
-In-Reply-To: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
-References: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
+From 1c98bec0074d8b69f5cab1f3adbca5d60ea1b99d Mon Sep 17 00:00:00 2001
+Message-Id: <1c98bec0074d8b69f5cab1f3adbca5d60ea1b99d.1528073963.git.jan.steffens@gmail.com>
+In-Reply-To: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.git.jan.steffens@gmail.com>
+References: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 16 Dec 2017 23:08:02 +0100
Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
---
- include/freetype/config/ftoption.h | 4 ++--
+ include/freetype/config/ftoption.h | 2 ++
src/cff/cffobjs.c | 4 ----
src/cid/cidobjs.c | 4 ----
src/type1/t1objs.c | 4 ----
- 4 files changed, 2 insertions(+), 14 deletions(-)
+ 4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 438d0614b..d04177197 100644
+index 227790fd9..7d4c40160 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -750,7 +750,7 @@ FT_BEGIN_HEADER
- /* switch between the two engines using the `hinting-engine' property of */
- /* the type1 driver module. */
- /* */
--/* #define T1_CONFIG_OPTION_OLD_ENGINE */
+@@ -760,6 +760,7 @@ FT_BEGIN_HEADER
+ * the type1 driver module.
+ *
+ */
+#define T1_CONFIG_OPTION_OLD_ENGINE
/*************************************************************************/
-@@ -793,7 +793,7 @@ FT_BEGIN_HEADER
- /* switch between the two engines using the `hinting-engine' property of */
- /* the cff driver module. */
- /* */
--/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
+@@ -803,6 +804,7 @@ FT_BEGIN_HEADER
+ * the cff driver module.
+ *
+ */
+#define CFF_CONFIG_OPTION_OLD_ENGINE
/*************************************************************************/
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index 61b736ca2..985766a77 100644
+index b3f0f99e3..f85fa180e 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -1162,11 +1162,7 @@
@@ -52,10 +50,10 @@ index 61b736ca2..985766a77 100644
driver->no_stem_darkening = TRUE;
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
-index 77afe1c87..e1ea64cd6 100644
+index 91c4ed94a..6c6cff318 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
-@@ -472,11 +472,7 @@
+@@ -479,11 +479,7 @@
/* set default property values, cf. `ftt1drv.h' */
@@ -68,10 +66,10 @@ index 77afe1c87..e1ea64cd6 100644
driver->no_stem_darkening = TRUE;
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
-index 7333c4c95..4cc27fe9e 100644
+index 568440d05..0bf329973 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
-@@ -587,11 +587,7 @@
+@@ -594,11 +594,7 @@
/* set default property values, cf. `ftt1drv.h' */
@@ -84,5 +82,5 @@ index 7333c4c95..4cc27fe9e 100644
driver->no_stem_darkening = TRUE;
--
-2.17.0
+2.17.1
diff --git a/PKGBUILD b/PKGBUILD
index 7bc4504e0496..7418875000aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=freetype2-git
pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.9.1+p2+g660afb5ce
+pkgver=2.9.1+p47+gf999375a9
pkgrel=1
epoch=1
pkgdesc="Font rasterization library (from git)"
@@ -24,10 +24,10 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
freetype2.sh)
sha1sums=('SKIP'
'SKIP'
- 'c8fc59c8279cef310a517d2add6ef14e70e87a61'
- '9c58d84ad7c46d28d94f42aa9839adc8469e0e12'
- '0cd35ca8c395c642f14068cea72f909aee6dd86d'
- '86733121fdb5b6c88fe6fa47a7b4f8fe04c63ba2'
+ 'cc84900f1a6f8f1a34b99034dd9f9b074784fc3e'
+ '9e6998d19e9cc78a6a796e284d8d3089813fb5b3'
+ 'a84a23baf95b844a7b4555e9d436708718967cb1'
+ 'f5cd2a12969f26b4c30313a756e567cb57efebc7'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')