summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Enable-table-validation-modules.patch4
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch16
-rw-r--r--0003-Enable-long-PCF-family-names.patch17
-rw-r--r--0004-Enable-old-engines-but-keep-adobe-as-default.patch20
-rw-r--r--PKGBUILD10
6 files changed, 43 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 56f3b5557dbb..bd509cea9316 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.9.1+p47+gf999375a9
+ pkgver = 2.9.1+p48+gcc6267722
pkgrel = 1
epoch = 1
url = https://www.freetype.org/
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = cc84900f1a6f8f1a34b99034dd9f9b074784fc3e
- sha1sums = 9e6998d19e9cc78a6a796e284d8d3089813fb5b3
- sha1sums = a84a23baf95b844a7b4555e9d436708718967cb1
- sha1sums = f5cd2a12969f26b4c30313a756e567cb57efebc7
+ sha1sums = b573f512cedfcb1d0d8f002b610b70eff50b0205
+ sha1sums = 97dc94a4af9201ccd4f7f53b9bc215a4159fc4cd
+ sha1sums = d6399be0a9bceddd60b786f63bbfb44865ddfae3
+ sha1sums = 248164642f8c9b8441494689b14f2d98c025ee49
sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.9.1+p47+gf999375a9
+ provides = freetype2=2.9.1+p48+gcc6267722
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+p47+gf999375a9
+ provides = freetype2-demos=2.9.1+p48+gcc6267722
conflicts = freetype2-demos
pkgname = freetype2-docs-git
pkgdesc = Freetype documentation (from git)
depends = freetype2-git
- provides = freetype2-docs=2.9.1+p47+gf999375a9
+ provides = freetype2-docs=2.9.1+p48+gcc6267722
conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index b7fe83153e22..efb5382174a3 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From 5c07abe9d2d676c3c19a15bf41d1c2ea75428895 Mon Sep 17 00:00:00 2001
-Message-Id: <5c07abe9d2d676c3c19a15bf41d1c2ea75428895.1528073963.git.jan.steffens@gmail.com>
+From eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0 Mon Sep 17 00:00:00 2001
+Message-Id: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.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
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 8011edd3ef22..d9c37e2c4211 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-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 b34999b29f8016706716f40f456def2cfad177a8 Mon Sep 17 00:00:00 2001
+Message-Id: <b34999b29f8016706716f40f456def2cfad177a8.1528102613.git.jan.steffens@gmail.com>
+In-Reply-To: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+References: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.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,16 +11,16 @@ 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 c030a88cd..30aac1366 100644
+index 66bb8f9c8..301940a9a 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -638,8 +638,8 @@ FT_BEGIN_HEADER
- * [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+@@ -649,8 +649,8 @@ FT_BEGIN_HEADER
*
*/
+ /* #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 2 */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 711158ef75de..7241b12755b2 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,23 +1,24 @@
-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 c969754e4e68e2b217859c7a409e7a4c4b1e9268 Mon Sep 17 00:00:00 2001
+Message-Id: <c969754e4e68e2b217859c7a409e7a4c4b1e9268.1528102613.git.jan.steffens@gmail.com>
+In-Reply-To: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+References: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.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 | 1 +
- 1 file changed, 1 insertion(+)
+ 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 30aac1366..227790fd9 100644
+index 301940a9a..f47155b83 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -830,6 +830,7 @@ FT_BEGIN_HEADER
+@@ -843,7 +843,7 @@ FT_BEGIN_HEADER
* `no-long-family-names' property of the pcf driver module.
*
*/
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
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 bd3129c075e7..91c8f3a4f35d 100644
--- a/0004-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -1,34 +1,36 @@
-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 41bbf735a170d62e43ff399c28ae4a987a6ea21f Mon Sep 17 00:00:00 2001
+Message-Id: <41bbf735a170d62e43ff399c28ae4a987a6ea21f.1528102613.git.jan.steffens@gmail.com>
+In-Reply-To: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+References: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.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 | 2 ++
+ include/freetype/config/ftoption.h | 4 ++--
src/cff/cffobjs.c | 4 ----
src/cid/cidobjs.c | 4 ----
src/type1/t1objs.c | 4 ----
- 4 files changed, 2 insertions(+), 12 deletions(-)
+ 4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 227790fd9..7d4c40160 100644
+index f47155b83..fd24ac4b8 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -760,6 +760,7 @@ FT_BEGIN_HEADER
+@@ -771,7 +771,7 @@ FT_BEGIN_HEADER
* the type1 driver module.
*
*/
+-/* #define T1_CONFIG_OPTION_OLD_ENGINE */
+#define T1_CONFIG_OPTION_OLD_ENGINE
/*************************************************************************/
-@@ -803,6 +804,7 @@ FT_BEGIN_HEADER
+@@ -815,7 +815,7 @@ FT_BEGIN_HEADER
* the cff driver module.
*
*/
+-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
+#define CFF_CONFIG_OPTION_OLD_ENGINE
diff --git a/PKGBUILD b/PKGBUILD
index 7418875000aa..5f8498c60a4c 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+p47+gf999375a9
+pkgver=2.9.1+p48+gcc6267722
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'
- 'cc84900f1a6f8f1a34b99034dd9f9b074784fc3e'
- '9e6998d19e9cc78a6a796e284d8d3089813fb5b3'
- 'a84a23baf95b844a7b4555e9d436708718967cb1'
- 'f5cd2a12969f26b4c30313a756e567cb57efebc7'
+ 'b573f512cedfcb1d0d8f002b610b70eff50b0205'
+ '97dc94a4af9201ccd4f7f53b9bc215a4159fc4cd'
+ 'd6399be0a9bceddd60b786f63bbfb44865ddfae3'
+ '248164642f8c9b8441494689b14f2d98c025ee49'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')