summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Pagani2018-05-23 10:49:20 +0200
committerBruno Pagani2018-05-23 10:49:20 +0200
commit923ee651f90c425a535aaa7ce62eb819463e6f5c (patch)
tree4e52475f1c3ec2aa528a217e0692809f8f2dc502
parent17e89e147d11bc111b4be21fa661e26f8afc2e16 (diff)
downloadaur-923ee651f90c425a535aaa7ce62eb819463e6f5c.tar.gz
upgpkg: freetype2-cleartype 2.9.1-1
Upstream release, rebase patches.
-rw-r--r--.SRCINFO20
-rw-r--r--0001-Enable-table-validation-modules.patch12
-rw-r--r--0001-psaux-Correctly-handle-Flex-features-52846.patch38
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch14
-rw-r--r--0003-Enable-long-PCF-family-names.patch14
-rw-r--r--0007-cleartype.patch7
-rw-r--r--PKGBUILD43
7 files changed, 50 insertions, 98 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ce98d56e6d7..9abbc7cb351 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = freetype2-cleartype
pkgdesc = Font rasterization library with ClearType patch
- pkgver = 2.9
- pkgrel = 2
+ pkgver = 2.9.1
+ pkgrel = 1
url = https://www.freetype.org/
arch = x86_64
license = GPL
@@ -14,22 +14,20 @@ pkgbase = freetype2-cleartype
provides = freetype2
provides = libfreetype.so
conflicts = freetype2
- source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2
- source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2.sig
+ source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2
+ source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2.sig
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-infinality-subpixel-hinting.patch
source = 0003-Enable-long-PCF-family-names.patch
- source = 0001-psaux-Correctly-handle-Flex-features-52846.patch
source = 0007-cleartype.patch
source = freetype2.sh
validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
- sha1sums = 94c4399b1a55c5892812e732843fcb4a7c2fe657
+ sha1sums = 220c82062171c513e4017c523d196933c9de4a7d
sha1sums = SKIP
- sha1sums = b69531770c343d403be294b7e4d25ac45738c833
- sha1sums = 3d26a569f0cb94c28a550577f5dcaadb4e193d91
- sha1sums = 770f1981734a837bcf065564c91644b4cc5e256a
- sha1sums = 21ad7dd31e16adb5b39adfa5671018a736626562
- sha1sums = 6aaa8af267f85079c8f21db417bc1741de980113
+ sha1sums = d9eb22e5c962923089b0c9fc5491cf28a19bd982
+ sha1sums = d13503902e0404cf3558db76b477f23f9910d06e
+ sha1sums = fc49742fb6c19fe0677e3552bb7c00aac8530265
+ sha1sums = 60f26c740ac53c684703ef401a481659a7364ff4
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-cleartype
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 5fd339ff056..b492755d99b 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From c7a6a2312313a971089fb592deb8c476be4dca0f Mon Sep 17 00:00:00 2001
-Message-Id: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001
+Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.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,11 +9,11 @@ Subject: [PATCH 1/4] Enable table validation modules
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index 56a2340e56d187aa..3a028329187275df 100644
+index 4bf344524..f9aa44b2a 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -120,30 +120,30 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
@@ -37,7 +37,7 @@ index 56a2340e56d187aa..3a028329187275df 100644
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += bzip2
- # OpenType table validation. Needs ftotval.c below.
+ # OpenType table validation. Needs `ftotval.c' below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
@@ -46,5 +46,5 @@ index 56a2340e56d187aa..3a028329187275df 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.15.1
+2.17.0
diff --git a/0001-psaux-Correctly-handle-Flex-features-52846.patch b/0001-psaux-Correctly-handle-Flex-features-52846.patch
deleted file mode 100644
index 44630fbdcf1..00000000000
--- a/0001-psaux-Correctly-handle-Flex-features-52846.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001
-From: Ewald Hew <ewaldhew@gmail.com>
-Date: Wed, 10 Jan 2018 13:24:56 +0800
-Subject: [PATCH] [psaux] Correctly handle Flex features (#52846).
-
-* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
-cf2_cmdHMOVETO>: Do not move if doing Flex.
----
- src/psaux/psintrp.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
-index 5c0ee78..da5a8da 100644
---- a/src/psaux/psintrp.c
-+++ b/src/psaux/psintrp.c
-@@ -852,7 +852,8 @@
-
- curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
-
-- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-+ if ( !decoder->flex_state )
-+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-
- break;
-
-@@ -2674,7 +2675,8 @@
-
- curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
-
-- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-+ if ( !decoder->flex_state )
-+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-
- break;
-
---
-2.16.1
-
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 5f4391504bf..461f8e91cdd 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-From 438b8c65e900d4c28db9eeb2a45e5998048eb471 Mon Sep 17 00:00:00 2001
-Message-Id: <438b8c65e900d4c28db9eeb2a45e5998048eb471.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001
+Message-Id: <ecb052d87dd80603aac454a65fd6e074bc57772c.1525259379.git.jan.steffens@gmail.com>
+In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.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 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
+index 4bcab2af5..862b926d5 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
+@@ -658,8 +658,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 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
/*************************************************************************/
--
-2.15.1
+2.17.0
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index be202c1f090..38623e36927 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,7 @@
-From 7e262bff01573c67432f8b8fd879bf858e1611b3 Mon Sep 17 00:00:00 2001
-Message-Id: <7e262bff01573c67432f8b8fd879bf858e1611b3.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001
+Message-Id: <bbb386e90cf9440c9c9952aa14bc309f2ec76205.1525259379.git.jan.steffens@gmail.com>
+In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.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 e6f9720df9b5d004..832c9c3cd200f91a 100644
+index 862b926d5..bd6a4f7d3 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -845,7 +845,7 @@ FT_BEGIN_HEADER
+@@ -849,7 +849,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 e6f9720df9b5d004..832c9c3cd200f91a 100644
/*************************************************************************/
--
-2.15.1
+2.17.0
diff --git a/0007-cleartype.patch b/0007-cleartype.patch
index 582c33e2ba2..596c6a9f2ca 100644
--- a/0007-cleartype.patch
+++ b/0007-cleartype.patch
@@ -1,7 +1,6 @@
-diff -ura include/freetype/config/ftoption.h include/freetype/config/ftoption.h
---- include/freetype/config/ftoption.h 2017-10-29 03:33:51.835759368 +0300
-+++ include/freetype/config/ftoption.h 2017-10-29 03:36:59.231676456 +0300
-@@ -119,7 +119,7 @@
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -122,7 +122,7 @@
/* rendering technology that produces excellent output without LCD */
/* filtering. */
/* */
diff --git a/PKGBUILD b/PKGBUILD
index 1fd985f8f65..59500b98079 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,33 +8,31 @@
# Contributor: freedom
pkgname=freetype2-cleartype
-pkgver=2.9
-pkgrel=2
+pkgver=2.9.1
+pkgrel=1
pkgdesc="Font rasterization library with ClearType patch"
arch=(x86_64)
license=('GPL')
url="https://www.freetype.org/"
- # adding harfbuzz for improved OpenType features auto-hinting
- # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+ # adding harfbuzz for improved OpenType features auto-hinting
+ # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
makedepends=('libx11')
conflicts=('freetype2')
provides=('freetype2' 'libfreetype.so')
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-infinality-subpixel-hinting.patch
- 0003-Enable-long-PCF-family-names.patch
- 0001-psaux-Correctly-handle-Flex-features-52846.patch
- 0007-cleartype.patch
- freetype2.sh
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-infinality-subpixel-hinting.patch
+ 0003-Enable-long-PCF-family-names.patch
+ 0007-cleartype.patch
+ freetype2.sh
)
-sha1sums=('94c4399b1a55c5892812e732843fcb4a7c2fe657'
+sha1sums=('220c82062171c513e4017c523d196933c9de4a7d'
'SKIP'
- 'b69531770c343d403be294b7e4d25ac45738c833'
- '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
- '770f1981734a837bcf065564c91644b4cc5e256a'
- '21ad7dd31e16adb5b39adfa5671018a736626562'
- '6aaa8af267f85079c8f21db417bc1741de980113'
+ 'd9eb22e5c962923089b0c9fc5491cf28a19bd982'
+ 'd13503902e0404cf3558db76b477f23f9910d06e'
+ 'fc49742fb6c19fe0677e3552bb7c00aac8530265'
+ '60f26c740ac53c684703ef401a481659a7364ff4'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -42,23 +40,18 @@ prepare() {
mv freetype-${pkgver} freetype2
cd freetype2
-
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
- patch -Np0 -i ../0007-cleartype.patch
-
- # Freetype 2.9 regression: bad rendering for some Type 1 fonts
- # https://savannah.nongnu.org/bugs/?52846
- patch -Np1 -i ../0001-psaux-Correctly-handle-Flex-features-52846.patch
+ patch -Np1 -i ../0007-cleartype.patch
}
build() {
- cd freetype2
- ./configure --prefix=/usr --disable-static
- make
+ cd freetype2
+ ./configure --prefix=/usr --disable-static
+ make
}
check() {