summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2015-10-04 17:46:01 +0200
committerJan Alexander Steffens (heftig)2015-10-04 17:46:34 +0200
commit5c730febb33f992fd5a24161be1499b68d936a66 (patch)
tree2fd834671e4d2d67d1d06d7f2f7bbeb0999d36ce
parentc5301006cf68cd1fdf93276c665bf7793e292a79 (diff)
downloadaur-5c730febb33f992fd5a24161be1499b68d936a66.tar.gz
Sync patches from SVN
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Enable-table-validation-modules.patch4
-rw-r--r--0002-Enable-subpixel-rendering.patch4
-rw-r--r--0003-Enable-subpixel-hinting.patch4
-rw-r--r--0004-Mask-subpixel-hinting-with-an-env-var.patch31
-rw-r--r--PKGBUILD6
6 files changed, 43 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d7831b3d962..d44abb048da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,9 +21,9 @@ pkgbase = freetype2-git
source = 0003-Enable-subpixel-hinting.patch
source = 0004-Add-env-var-to-turn-off-subpixel-hinting.patch
sha1sums = SKIP
- sha1sums = 731fe15f4db20127ed457b0d164f4ff57597c813
- sha1sums = c0ec37c3b332f09dbafeff874fe658306510b3c1
- sha1sums = 69caf19093a272e7c780ad8ae91dcd965de7a846
+ sha1sums = 1c7bc438df0428a63f881e7e4343b22c5b09ecb1
+ sha1sums = e2d2b8c4847ab9cfd497179c7140835e99ece711
+ sha1sums = ebe3d7a6fc41304a77c23cb56e94dc718146d963
sha1sums = 0a75db92c93c7a1576052348174fa510740d079f
pkgname = freetype2-git
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index e16be8ed8fe..4ed7dd81b17 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,4 +1,4 @@
-From 44c1d099a53b9152b69042bf08320147e9255b94 Mon Sep 17 00:00:00 2001
+From 27f765b5f41638de36de728e9018a1400b0be615 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
@@ -30,5 +30,5 @@ index 2984e51..a5db21d 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.4.4
+2.6.0
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 444c1320cc0..acc0475c0bd 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,4 +1,4 @@
-From 2321c9da82f4daf7c118858ec9e77753c3b6f3fb Mon Sep 17 00:00:00 2001
+From 27d96091b2bb0a825cbd62a332ef918f39c6126f 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
@@ -21,5 +21,5 @@ index 4970945..ab407e3 100644
/*************************************************************************/
--
-2.4.4
+2.6.0
diff --git a/0003-Enable-subpixel-hinting.patch b/0003-Enable-subpixel-hinting.patch
index e9a638e62fd..00a5c2f79f3 100644
--- a/0003-Enable-subpixel-hinting.patch
+++ b/0003-Enable-subpixel-hinting.patch
@@ -1,4 +1,4 @@
-From 717abd800c0b465db73f7e0d1e77669bcab165a5 Mon Sep 17 00:00:00 2001
+From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:43:57 +0200
Subject: [PATCH 3/4] Enable subpixel hinting
@@ -21,5 +21,5 @@ index ab407e3..a2eab6a 100644
/*************************************************************************/
--
-2.4.4
+2.6.0
diff --git a/0004-Mask-subpixel-hinting-with-an-env-var.patch b/0004-Mask-subpixel-hinting-with-an-env-var.patch
new file mode 100644
index 00000000000..ec8910488cb
--- /dev/null
+++ b/0004-Mask-subpixel-hinting-with-an-env-var.patch
@@ -0,0 +1,31 @@
+From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:34:54 +0200
+Subject: [PATCH 4/4] Mask subpixel hinting with an env var
+
+---
+ src/truetype/ttobjs.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
+index 6060d6f..3fa98e7 100644
+--- a/src/truetype/ttobjs.c
++++ b/src/truetype/ttobjs.c
+@@ -1302,10 +1302,11 @@
+ TT_Driver driver = (TT_Driver)ttdriver;
+
+ #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
+-#else
+- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++ if ( getenv( "FT2_SUBPIXEL_HINTING" ) )
++ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++ else
+ #endif
++ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+
+--
+2.6.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 104cd9c9940..b46c1f9dc43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,9 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
0003-Enable-subpixel-hinting.patch
0004-Add-env-var-to-turn-off-subpixel-hinting.patch)
sha1sums=('SKIP'
- '731fe15f4db20127ed457b0d164f4ff57597c813'
- 'c0ec37c3b332f09dbafeff874fe658306510b3c1'
- '69caf19093a272e7c780ad8ae91dcd965de7a846'
+ '1c7bc438df0428a63f881e7e4343b22c5b09ecb1'
+ 'e2d2b8c4847ab9cfd497179c7140835e99ece711'
+ 'ebe3d7a6fc41304a77c23cb56e94dc718146d963'
'0a75db92c93c7a1576052348174fa510740d079f')
provides=("freetype2=$pkgver" libfreetype.so)