summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2015-06-26 22:58:03 +0200
committerJan Alexander Steffens (heftig)2015-06-26 23:00:09 +0200
commitc5301006cf68cd1fdf93276c665bf7793e292a79 (patch)
treed16088d6cf8751c62edbf22e193a1da0d460b3cd
parent129b293259667cabebcbf78fd26520fe5a8c636f (diff)
downloadaur-c5301006cf68cd1fdf93276c665bf7793e292a79.tar.gz
Rebase patches
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Enable-table-validation-modules.patch4
-rw-r--r--0002-Enable-subpixel-rendering.patch12
-rw-r--r--0003-Enable-subpixel-hinting.patch12
-rw-r--r--0004-Add-env-var-to-turn-off-subpixel-hinting.patch2
-rw-r--r--PKGBUILD10
6 files changed, 26 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f584982607e..d7831b3d962 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6+6+g5931268-1
+ pkgver = 2.6+17+g649f2e5-1
pkgrel = 1
url = http://freetype.sourceforge.net
arch = i686
@@ -12,7 +12,7 @@ pkgbase = freetype2-git
depends = sh
depends = libpng
depends = harfbuzz
- provides = freetype2=2.6+6+g5931268-1
+ provides = freetype2=2.6+17+g649f2e5-1
provides = libfreetype.so
conflicts = freetype2
source = git://git.sv.gnu.org/freetype/freetype2.git
@@ -21,10 +21,10 @@ pkgbase = freetype2-git
source = 0003-Enable-subpixel-hinting.patch
source = 0004-Add-env-var-to-turn-off-subpixel-hinting.patch
sha1sums = SKIP
- sha1sums = ccc9aaf53621a6e752b01db9e054aa63eb56f9b6
- sha1sums = a9e78bc59ed06f3e11efc33e54fd7695899862a5
- sha1sums = 3b69ac9f198ee3e4459e2466d3cb0f0b07cc3837
- sha1sums = 7517bf45c066d036e3ec729b17c8fa221e4e81a0
+ sha1sums = 731fe15f4db20127ed457b0d164f4ff57597c813
+ sha1sums = c0ec37c3b332f09dbafeff874fe658306510b3c1
+ sha1sums = 69caf19093a272e7c780ad8ae91dcd965de7a846
+ sha1sums = 0a75db92c93c7a1576052348174fa510740d079f
pkgname = freetype2-git
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index e8cdec138bb..e16be8ed8fe 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,4 +1,4 @@
-From 5c55ed25694e95a7ff6f3c231b3b5bcde233af30 Mon Sep 17 00:00:00 2001
+From 44c1d099a53b9152b69042bf08320147e9255b94 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
@@ -8,7 +8,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 3d70a7c..862fe34 100644
+index 2984e51..a5db21d 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 7670fd4c58a..444c1320cc0 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,16 +1,16 @@
-From 54382c3d753b08e92033927cbd83ea8d4d417eab Mon Sep 17 00:00:00 2001
+From 2321c9da82f4daf7c118858ec9e77753c3b6f3fb 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
---
- include/freetype2/config/ftoption.h | 2 +-
+ include/freetype/config/ftoption.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/include/freetype2/config/ftoption.h b/include/freetype2/config/ftoption.h
-index 3904645..17d6ba5 100644
---- a/include/freetype2/config/ftoption.h
-+++ b/include/freetype2/config/ftoption.h
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 4970945..ab407e3 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
diff --git a/0003-Enable-subpixel-hinting.patch b/0003-Enable-subpixel-hinting.patch
index 323d70cb771..e9a638e62fd 100644
--- a/0003-Enable-subpixel-hinting.patch
+++ b/0003-Enable-subpixel-hinting.patch
@@ -1,16 +1,16 @@
-From d9c87f10ce02b5622323bed419df0ea5ac746347 Mon Sep 17 00:00:00 2001
+From 717abd800c0b465db73f7e0d1e77669bcab165a5 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
---
- include/freetype2/config/ftoption.h | 2 +-
+ include/freetype/config/ftoption.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/include/freetype2/config/ftoption.h b/include/freetype2/config/ftoption.h
-index 17d6ba5..07b4211 100644
---- a/include/freetype2/config/ftoption.h
-+++ b/include/freetype2/config/ftoption.h
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index ab407e3..a2eab6a 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
@@ -602,7 +602,7 @@ FT_BEGIN_HEADER
/* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
/* defined. */
diff --git a/0004-Add-env-var-to-turn-off-subpixel-hinting.patch b/0004-Add-env-var-to-turn-off-subpixel-hinting.patch
index acf979f729e..26f9d7635d5 100644
--- a/0004-Add-env-var-to-turn-off-subpixel-hinting.patch
+++ b/0004-Add-env-var-to-turn-off-subpixel-hinting.patch
@@ -1,4 +1,4 @@
-From d03029736ac69256ca3fe5d302bebcf5e22d8844 Mon Sep 17 00:00:00 2001
+From 649f2e555fbed9d883892d7939a6c493ad716af7 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:33:22 +0200
Subject: [PATCH 4/4] Add env var to turn off subpixel hinting
diff --git a/PKGBUILD b/PKGBUILD
index f84cfe0f138..104cd9c9940 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=freetype2-git
-pkgver=2.6+6+g5931268-1
+pkgver=2.6+17+g649f2e5-1
pkgrel=1
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
@@ -18,10 +18,10 @@ 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'
- 'ccc9aaf53621a6e752b01db9e054aa63eb56f9b6'
- 'a9e78bc59ed06f3e11efc33e54fd7695899862a5'
- '3b69ac9f198ee3e4459e2466d3cb0f0b07cc3837'
- '7517bf45c066d036e3ec729b17c8fa221e4e81a0')
+ '731fe15f4db20127ed457b0d164f4ff57597c813'
+ 'c0ec37c3b332f09dbafeff874fe658306510b3c1'
+ '69caf19093a272e7c780ad8ae91dcd965de7a846'
+ '0a75db92c93c7a1576052348174fa510740d079f')
provides=("freetype2=$pkgver" libfreetype.so)
conflicts=("freetype2")