summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Enable-table-validation-modules.patch18
-rw-r--r--0002-Enable-subpixel-rendering.patch10
-rw-r--r--0003-Enable-subpixel-hinting.patch (renamed from enable-subpixel-hinting.diff)20
-rw-r--r--PKGBUILD14
5 files changed, 44 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5bdd3eb77cac..1b91b7c6e87e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jul 20 17:49:03 UTC 2016
+# Mon Aug 29 06:49:36 UTC 2016
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6.5+p25+g7f63105
- pkgrel = 3
+ pkgver = 2.6.5+p61+ga6ee6fe
+ pkgrel = 1
epoch = 1
url = http://www.freetype.org/
install = freetype2.install
@@ -19,20 +19,20 @@ pkgbase = freetype2-git
depends = libpng
depends = harfbuzz
provides = libfreetype.so
- provides = freetype2=2.6.5+p25+g7f63105
+ provides = freetype2=2.6.5+p61+ga6ee6fe
conflicts = freetype2
backup = etc/profile.d/freetype2.sh
source = git://git.sv.gnu.org/freetype/freetype2.git
source = git://git.sv.gnu.org/freetype/freetype2-demos.git
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-subpixel-rendering.patch
- source = enable-subpixel-hinting.diff
+ source = 0003-Enable-subpixel-hinting.patch
source = freetype2.sh
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = e1fde7854d2a64868a5eef07415ad23c339fc630
- sha1sums = 7da3af8e1e002e39a247c37a05a10beb576007d6
- sha1sums = b1dc518903bb4e4086139f86abda44aef1a1b5a0
+ sha1sums = b5307ca1f11cb14081aef2b2439377ba99537bb3
+ sha1sums = 0ccdef0066335efa41b375c44c3d783e361f188e
+ sha1sums = 419d4e5b766742f08ebb2d01c2b9545eec827c81
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 55288708b19f..f803bd345e69 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,34 +1,34 @@
-From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001
+From d45ccbc59730f8ecbde121e7b929fa4de8f2371a Mon Sep 17 00:00:00 2001
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
+Subject: [PATCH 1/3] Enable table validation modules
---
modules.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index d677565a2bc2b5a2..f19cbec33384a86f 100644
+index f30049c38cc45159..7b8e50fe1b34584a 100644
--- a/modules.cfg
+++ b/modules.cfg
-@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
- AUX_MODULES += cache
-
+@@ -120,7 +120,7 @@ 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).
#
-@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
-
+@@ -143,7 +143,7 @@ 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.9.0
+2.9.3
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index d70b4f0e2cf6..08ab1ca0f8b0 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,17 +1,17 @@
-From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001
+From 50db2239cff623fc2f8be8cb6ae4f587f771fd2c Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/4] Enable subpixel rendering
+Subject: [PATCH 2/3] Enable subpixel rendering
---
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 2556c64d9d6c0838..8e58403529f597e5 100644
+index ab9efbe3e4d8745e..27d388c07be2877c 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
+@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
@@ -21,5 +21,5 @@ index 2556c64d9d6c0838..8e58403529f597e5 100644
/*************************************************************************/
--
-2.9.0
+2.9.3
diff --git a/enable-subpixel-hinting.diff b/0003-Enable-subpixel-hinting.patch
index bca0fd0b6157..205fe5fd6323 100644
--- a/enable-subpixel-hinting.diff
+++ b/0003-Enable-subpixel-hinting.patch
@@ -1,15 +1,25 @@
+From 2f81e416bd5f5901ae3e226f11c558a275b930b2 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/3] Enable subpixel hinting
+
+---
+ 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 8e58403529f597e5..197e15cdc3cc1e74 100644
+index 27d388c07be2877c..2a6d778f50663f66 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -632,7 +632,7 @@ FT_BEGIN_HEADER
+@@ -676,7 +676,7 @@ 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 ( 1 | 2 )
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
/*************************************************************************/
---
-2.9.0
+--
+2.9.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 8c845e7ae1f7..6062770f2b08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgname=freetype2-git
epoch=1
-pkgver=2.6.5+p25+g7f63105
-pkgrel=3
+pkgver=2.6.5+p61+ga6ee6fe
+pkgrel=1
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
license=('GPL')
@@ -21,13 +21,13 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
git://git.sv.gnu.org/freetype/freetype2-demos.git
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
- enable-subpixel-hinting.diff
+ 0003-Enable-subpixel-hinting.patch
freetype2.sh)
sha1sums=('SKIP'
'SKIP'
- 'e1fde7854d2a64868a5eef07415ad23c339fc630'
- '7da3af8e1e002e39a247c37a05a10beb576007d6'
- 'b1dc518903bb4e4086139f86abda44aef1a1b5a0'
+ 'b5307ca1f11cb14081aef2b2439377ba99537bb3'
+ '0ccdef0066335efa41b375c44c3d783e361f188e'
+ '419d4e5b766742f08ebb2d01c2b9545eec827c81'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -38,7 +38,7 @@ prepare() {
cd freetype2
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- patch -Np1 -i ../enable-subpixel-hinting.diff
+ patch -Np1 -i ../0003-Enable-subpixel-hinting.patch
./autogen.sh