summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2019-03-15 11:22:09 +0000
committerJan Alexander Steffens (heftig)2019-03-15 11:22:09 +0000
commitea2605def3b4b6b9b15a37a737f8050084bee92e (patch)
tree5140f1bf00fde7ee75764d2350ca227a4d03a181
parenta4d87c19daa1450cb625dd8e39cc09ec3bddee27 (diff)
downloadaur-freetype2-git.tar.gz
Update patches
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Enable-table-validation-modules.patch8
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch16
-rw-r--r--0003-Enable-long-PCF-family-names.patch18
-rw-r--r--0004-Enable-old-engines-but-keep-adobe-as-default.patch34
-rw-r--r--PKGBUILD10
6 files changed, 51 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6d36ea9eb0..b22876e3542 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.9.1+p299+gfb0d66d04
+ pkgver = 2.10.0+p0+gfbbcf5036
pkgrel = 1
epoch = 1
url = https://www.freetype.org/
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = b573f512cedfcb1d0d8f002b610b70eff50b0205
- sha1sums = 97dc94a4af9201ccd4f7f53b9bc215a4159fc4cd
- sha1sums = d6399be0a9bceddd60b786f63bbfb44865ddfae3
- sha1sums = 248164642f8c9b8441494689b14f2d98c025ee49
+ sha1sums = 46fd67e6a594f6c2c473b9321ba64913984ba42f
+ sha1sums = 4bf0c0749db09878b918cc404300f0d3e9091607
+ sha1sums = af76172be8135e74391b7ad1b82c2124ae0ad86c
+ sha1sums = 7770412a35d60e38cbe673c45214fbe9a17bedcf
sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.9.1+p299+gfb0d66d04
+ provides = freetype2=2.10.0+p0+gfbbcf5036
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+p299+gfb0d66d04
+ provides = freetype2-demos=2.10.0+p0+gfbbcf5036
conflicts = freetype2-demos
pkgname = freetype2-docs-git
pkgdesc = Freetype documentation (from git)
depends = freetype2-git
- provides = freetype2-docs=2.9.1+p299+gfb0d66d04
+ provides = freetype2-docs=2.10.0+p0+gfbbcf5036
conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index efb5382174a..2c38e8f5b66 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0 Mon Sep 17 00:00:00 2001
-Message-Id: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.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,7 +9,7 @@ Subject: [PATCH 1/4] Enable table validation modules
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index c46e61963..4618c8af3 100644
+index dc6c8d42d..2ab145016 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -111,26 +111,26 @@ AUX_MODULES += cache
@@ -42,5 +42,5 @@ index c46e61963..4618c8af3 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.17.1
+2.21.0
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index d9c37e2c421..22a19a6463e 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-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 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,11 +11,11 @@ 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 66bb8f9c8..301940a9a 100644
+index 12f47a82e..1d4469a99 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -649,8 +649,8 @@ FT_BEGIN_HEADER
- *
+@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
+ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
*/
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
@@ -26,5 +26,5 @@ index 66bb8f9c8..301940a9a 100644
/**************************************************************************
--
-2.17.1
+2.21.0
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 7241b12755b..916fe9cf141 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,7 @@
-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 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,12 +11,12 @@ 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 301940a9a..f47155b83 100644
+index 1d4469a99..4ff4e7821 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -843,7 +843,7 @@ FT_BEGIN_HEADER
- * `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
@@ -24,5 +24,5 @@ index 301940a9a..f47155b83 100644
/*************************************************************************/
--
-2.17.1
+2.21.0
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 91c8f3a4f35..325d6b9227f 100644
--- a/0004-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -1,7 +1,7 @@
-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 9482db09a09e2cb610f08a06e681d1a4b2356b36 Mon Sep 17 00:00:00 2001
+Message-Id: <9482db09a09e2cb610f08a06e681d1a4b2356b36.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: Sat, 16 Dec 2017 23:08:02 +0100
Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
@@ -14,21 +14,21 @@ Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index f47155b83..fd24ac4b8 100644
+index 4ff4e7821..3a7ed8725 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -771,7 +771,7 @@ FT_BEGIN_HEADER
- * the type1 driver module.
- *
+@@ -778,7 +778,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 */
+#define T1_CONFIG_OPTION_OLD_ENGINE
/*************************************************************************/
-@@ -815,7 +815,7 @@ FT_BEGIN_HEADER
- * the cff driver module.
- *
+@@ -820,7 +820,7 @@ FT_BEGIN_HEADER
+ * between the two engines using the `hinting-engine` property of the 'cff'
+ * driver module.
*/
-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
+#define CFF_CONFIG_OPTION_OLD_ENGINE
@@ -36,10 +36,10 @@ index f47155b83..fd24ac4b8 100644
/*************************************************************************/
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index b3f0f99e3..f85fa180e 100644
+index 1a1030c06..1a767ee26 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
-@@ -1162,11 +1162,7 @@
+@@ -1163,11 +1163,7 @@
/* set default property values, cf. `ftcffdrv.h' */
@@ -52,7 +52,7 @@ index b3f0f99e3..f85fa180e 100644
driver->no_stem_darkening = TRUE;
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
-index 91c4ed94a..6c6cff318 100644
+index 4e9728719..4747af185 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -479,11 +479,7 @@
@@ -68,10 +68,10 @@ index 91c4ed94a..6c6cff318 100644
driver->no_stem_darkening = TRUE;
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
-index 568440d05..0bf329973 100644
+index 741388a64..5abcdbc22 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
-@@ -594,11 +594,7 @@
+@@ -599,11 +599,7 @@
/* set default property values, cf. `ftt1drv.h' */
@@ -84,5 +84,5 @@ index 568440d05..0bf329973 100644
driver->no_stem_darkening = TRUE;
--
-2.17.1
+2.21.0
diff --git a/PKGBUILD b/PKGBUILD
index c82c64a1e99..9f47d826974 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+p299+gfb0d66d04
+pkgver=2.10.0+p0+gfbbcf5036
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'
- 'b573f512cedfcb1d0d8f002b610b70eff50b0205'
- '97dc94a4af9201ccd4f7f53b9bc215a4159fc4cd'
- 'd6399be0a9bceddd60b786f63bbfb44865ddfae3'
- '248164642f8c9b8441494689b14f2d98c025ee49'
+ '46fd67e6a594f6c2c473b9321ba64913984ba42f'
+ '4bf0c0749db09878b918cc404300f0d3e9091607'
+ 'af76172be8135e74391b7ad1b82c2124ae0ad86c'
+ '7770412a35d60e38cbe673c45214fbe9a17bedcf'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')