summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2018-05-03 06:43:44 +0200
committerJan Alexander Steffens (heftig)2018-05-03 06:43:44 +0200
commit649a033fc6fe220705bc8d749237e1da4b5c3fdf (patch)
treed9916030537d583aa7ea1c11c2019663f1541b7c
parent63179e27b03248622d74309fa28c814ca385dd15 (diff)
downloadaur-649a033fc6fe220705bc8d749237e1da4b5c3fdf.tar.gz
Update patches
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Enable-table-validation-modules.patch16
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch14
-rw-r--r--0003-Enable-long-PCF-family-names.patch14
-rw-r--r--0004-Enable-old-engines-but-keep-adobe-as-default.patch20
-rw-r--r--PKGBUILD10
6 files changed, 43 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a53259373359..ba48f80cb600 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.9+p33+g6f854692a
+ pkgver = 2.9.1+p2+g660afb5ce
pkgrel = 1
epoch = 1
url = https://www.freetype.org/
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = c65d93939677c3e9eb5380c9cfe20caf068d5a4b
- sha1sums = c3613862d8cda4bd151d26a6258b594a42fd1450
- sha1sums = a0452a704b2bd48f5b0407a4e782de502467e7d4
- sha1sums = 12306db4952f046387669f2bdb0d4dc4b1ea0f6e
+ sha1sums = c8fc59c8279cef310a517d2add6ef14e70e87a61
+ sha1sums = 9c58d84ad7c46d28d94f42aa9839adc8469e0e12
+ sha1sums = 0cd35ca8c395c642f14068cea72f909aee6dd86d
+ sha1sums = 86733121fdb5b6c88fe6fa47a7b4f8fe04c63ba2
sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.9+p33+g6f854692a
+ provides = freetype2=2.9.1+p2+g660afb5ce
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+p33+g6f854692a
+ provides = freetype2-demos=2.9.1+p2+g660afb5ce
conflicts = freetype2-demos
pkgname = freetype2-docs-git
pkgdesc = Freetype documentation (from git)
depends = freetype2-git
- provides = freetype2-docs=2.9+p33+g6f854692a
+ provides = freetype2-docs=2.9.1+p2+g660afb5ce
conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 9f1279b594ec..7ec8e34fda2d 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From 0670c22b537c67ebf78188fbc3af6c74b3efd9d9 Mon Sep 17 00:00:00 2001
-Message-Id: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+From 56649dbc4d1c78fc2253e4b54f781f603f6eb332 Mon Sep 17 00:00:00 2001
+Message-Id: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.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 c46e61963..4618c8af3 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.16.2
+2.17.0
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index c3ca91762942..b8cae8ef5b8c 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-From abbdee6e2ba3e13e927669864d6823b8af4c1ee5 Mon Sep 17 00:00:00 2001
-Message-Id: <abbdee6e2ba3e13e927669864d6823b8af4c1ee5.1520586205.git.jan.steffens@gmail.com>
-In-Reply-To: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
-References: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+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: "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,10 +11,10 @@ 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 a5cb7fff2..992c96b51 100644
+index 1cf694668..c25285b38 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
+@@ -629,8 +629,8 @@ FT_BEGIN_HEADER
/* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
/* */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
@@ -26,5 +26,5 @@ index a5cb7fff2..992c96b51 100644
/*************************************************************************/
--
-2.16.2
+2.17.0
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 0b6462b4f3d5..840e576d60d8 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,7 @@
-From 5479575ce1b0b869cf8ca8134eca57b93f897190 Mon Sep 17 00:00:00 2001
-Message-Id: <5479575ce1b0b869cf8ca8134eca57b93f897190.1520586205.git.jan.steffens@gmail.com>
-In-Reply-To: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
-References: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+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: "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,10 +11,10 @@ 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 992c96b51..d27e9150d 100644
+index c25285b38..438d0614b 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -845,7 +845,7 @@ FT_BEGIN_HEADER
+@@ -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. */
/* */
@@ -24,5 +24,5 @@ index 992c96b51..d27e9150d 100644
/*************************************************************************/
--
-2.16.2
+2.17.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 9ded6692d94b..256df971d873 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 9ff9495f79984c56961d8239a0d203924b8b9cba Mon Sep 17 00:00:00 2001
-Message-Id: <9ff9495f79984c56961d8239a0d203924b8b9cba.1520586205.git.jan.steffens@gmail.com>
-In-Reply-To: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
-References: <0670c22b537c67ebf78188fbc3af6c74b3efd9d9.1520586205.git.jan.steffens@gmail.com>
+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: "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,10 +14,10 @@ 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 d27e9150d..7052eb97a 100644
+index 438d0614b..d04177197 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -775,7 +775,7 @@ FT_BEGIN_HEADER
+@@ -750,7 +750,7 @@ FT_BEGIN_HEADER
/* switch between the two engines using the `hinting-engine' property of */
/* the type1 driver module. */
/* */
@@ -26,7 +26,7 @@ index d27e9150d..7052eb97a 100644
/*************************************************************************/
-@@ -818,7 +818,7 @@ FT_BEGIN_HEADER
+@@ -793,7 +793,7 @@ FT_BEGIN_HEADER
/* switch between the two engines using the `hinting-engine' property of */
/* the cff driver module. */
/* */
@@ -36,10 +36,10 @@ index d27e9150d..7052eb97a 100644
/*************************************************************************/
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index a2d7aec65..bc7dc16f8 100644
+index 61b736ca2..985766a77 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
-@@ -1163,11 +1163,7 @@
+@@ -1162,11 +1162,7 @@
/* set default property values, cf. `ftcffdrv.h' */
@@ -84,5 +84,5 @@ index 7333c4c95..4cc27fe9e 100644
driver->no_stem_darkening = TRUE;
--
-2.16.2
+2.17.0
diff --git a/PKGBUILD b/PKGBUILD
index 29cd85e2d697..7bc4504e0496 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=freetype2-git
pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.9+p33+g6f854692a
+pkgver=2.9.1+p2+g660afb5ce
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'
- 'c65d93939677c3e9eb5380c9cfe20caf068d5a4b'
- 'c3613862d8cda4bd151d26a6258b594a42fd1450'
- 'a0452a704b2bd48f5b0407a4e782de502467e7d4'
- '12306db4952f046387669f2bdb0d4dc4b1ea0f6e'
+ 'c8fc59c8279cef310a517d2add6ef14e70e87a61'
+ '9c58d84ad7c46d28d94f42aa9839adc8469e0e12'
+ '0cd35ca8c395c642f14068cea72f909aee6dd86d'
+ '86733121fdb5b6c88fe6fa47a7b4f8fe04c63ba2'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')