summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--0001-Enable-table-validation-modules.patch7
-rw-r--r--0002-Enable-infinality-subpixel-hinting.patch (renamed from 0003-Enable-infinality-subpixel-hinting.patch)15
-rw-r--r--0003-Enable-long-PCF-family-names.patch (renamed from 0004-Enable-long-PCF-family-names.patch)13
-rw-r--r--0004-Enable-old-engines-but-keep-adobe-as-default.patch88
-rw-r--r--PKGBUILD21
6 files changed, 134 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ff1f83b853b..837812ec2106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Sep 16 23:59:23 UTC 2017
+# Sat Dec 16 22:19:18 UTC 2017
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.8.1+p0+g39ce3ac4
- pkgrel = 1
+ pkgver = 2.8.1+p145+g2c048a8a6
+ pkgrel = 3
epoch = 1
url = https://www.freetype.org/
arch = i686
@@ -20,22 +20,24 @@ pkgbase = freetype2-git
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 = 0003-Enable-infinality-subpixel-hinting.patch
- source = 0004-Enable-long-PCF-family-names.patch
+ source = 0002-Enable-infinality-subpixel-hinting.patch
+ source = 0003-Enable-long-PCF-family-names.patch
+ source = 0004-Enable-old-engines-but-keep-adobe-as-default.patch
source = 0005-freetype-2.5.2-more-demos.patch
source = freetype2.sh
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = c3e91e668936206d3c158bffde0f69788a086a5b
- sha1sums = 81586014ea44375ddc85dd9dbcabae6e91c34d62
- sha1sums = 334f229875039794adeb574e27d365bb445fb314
+ sha1sums = b69531770c343d403be294b7e4d25ac45738c833
+ sha1sums = 3d26a569f0cb94c28a550577f5dcaadb4e193d91
+ sha1sums = 770f1981734a837bcf065564c91644b4cc5e256a
+ sha1sums = 6b551a5df41c9f02152b8456a457392ab5a4367e
sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.8.1+p0+g39ce3ac4
+ provides = freetype2=2.8.1+p145+g2c048a8a6
conflicts = freetype2
backup = etc/profile.d/freetype2.sh
@@ -43,12 +45,12 @@ pkgname = freetype2-demos-git
pkgdesc = Freetype tools and demos (from git)
depends = freetype2-git
depends = libx11
- provides = freetype2-demos=2.8.1+p0+g39ce3ac4
+ provides = freetype2-demos=2.8.1+p145+g2c048a8a6
conflicts = freetype2-demos
pkgname = freetype2-docs-git
pkgdesc = Freetype documentation (from git)
depends = freetype2-git
- provides = freetype2-docs=2.8.1+p0+g39ce3ac4
+ provides = freetype2-docs=2.8.1+p145+g2c048a8a6
conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 5508d421e0c6..5fd339ff056f 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,4 +1,5 @@
-From 17dd2751813c3c8b37dac474cc5024473eb9bece Mon Sep 17 00:00:00 2001
+From c7a6a2312313a971089fb592deb8c476be4dca0f Mon Sep 17 00:00:00 2001
+Message-Id: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.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
@@ -8,7 +9,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 517111efeb642459..64b2a34d510ce8f7 100644
+index 56a2340e56d187aa..3a028329187275df 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -120,30 +120,30 @@ AUX_MODULES += cache
@@ -45,5 +46,5 @@ index 517111efeb642459..64b2a34d510ce8f7 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.13.0
+2.15.1
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index b8f74de22e97..5f4391504bf8 100644
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,18 +1,21 @@
-From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
+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: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/4] Enable infinality subpixel hinting
+Subject: [PATCH 2/4] Enable infinality subpixel hinting
---
include/freetype/config/ftoption.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 1126716626b570df..ebb44acdbbef9a47 100644
+index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -684,8 +684,8 @@ FT_BEGIN_HEADER
- /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
+ /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
/* */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
@@ -23,5 +26,5 @@ index 1126716626b570df..ebb44acdbbef9a47 100644
/*************************************************************************/
--
-2.13.0
+2.15.1
diff --git a/0004-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 675423a7c472..be202c1f0902 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,17 +1,20 @@
-From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+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: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sun, 14 May 2017 18:09:31 +0200
-Subject: [PATCH 4/4] Enable long PCF family names
+Subject: [PATCH 3/4] Enable long PCF family names
---
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 ebb44acdbbef9a47..0b39b417162707e4 100644
+index e6f9720df9b5d004..832c9c3cd200f91a 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -865,7 +865,7 @@ FT_BEGIN_HEADER
+@@ -845,7 +845,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. */
/* */
@@ -21,5 +24,5 @@ index ebb44acdbbef9a47..0b39b417162707e4 100644
/*************************************************************************/
--
-2.13.0
+2.15.1
diff --git a/0004-Enable-old-engines-but-keep-adobe-as-default.patch b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
new file mode 100644
index 000000000000..09cd1f949352
--- /dev/null
+++ b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -0,0 +1,88 @@
+From 026fd5f70d81f719773247d4d0086c6023c23436 Mon Sep 17 00:00:00 2001
+Message-Id: <026fd5f70d81f719773247d4d0086c6023c23436.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: "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
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ src/cff/cffobjs.c | 4 ----
+ src/cid/cidobjs.c | 4 ----
+ src/type1/t1objs.c | 4 ----
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 832c9c3cd200f91a..dc3417d73e99d987 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -775,7 +775,7 @@ FT_BEGIN_HEADER
+ /* switch between the two engines using the `hinting-engine' property of */
+ /* the type1 driver module. */
+ /* */
+-/* #define T1_CONFIG_OPTION_OLD_ENGINE */
++#define T1_CONFIG_OPTION_OLD_ENGINE
+
+
+ /*************************************************************************/
+@@ -818,7 +818,7 @@ FT_BEGIN_HEADER
+ /* switch between the two engines using the `hinting-engine' property of */
+ /* the cff driver module. */
+ /* */
+-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
++#define CFF_CONFIG_OPTION_OLD_ENGINE
+
+
+ /*************************************************************************/
+diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
+index d4b6e5941ac44b58..c520f97f667f5d9a 100644
+--- a/src/cff/cffobjs.c
++++ b/src/cff/cffobjs.c
+@@ -1163,11 +1163,7 @@
+
+
+ /* set default property values, cf. `ftcffdrv.h' */
+-#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
+- driver->hinting_engine = FT_HINTING_FREETYPE;
+-#else
+ driver->hinting_engine = FT_HINTING_ADOBE;
+-#endif
+
+ driver->no_stem_darkening = TRUE;
+
+diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
+index ed1dca2656b0c66c..2c02e1ce7d330fc3 100644
+--- a/src/cid/cidobjs.c
++++ b/src/cid/cidobjs.c
+@@ -472,11 +472,7 @@
+
+
+ /* set default property values, cf. `ftt1drv.h' */
+-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
+- driver->hinting_engine = FT_HINTING_FREETYPE;
+-#else
+ driver->hinting_engine = FT_HINTING_ADOBE;
+-#endif
+
+ driver->no_stem_darkening = TRUE;
+
+diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
+index c00b322b138f8a95..c30a49d4e2b55e92 100644
+--- a/src/type1/t1objs.c
++++ b/src/type1/t1objs.c
+@@ -587,11 +587,7 @@
+
+
+ /* set default property values, cf. `ftt1drv.h' */
+-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
+- driver->hinting_engine = FT_HINTING_FREETYPE;
+-#else
+ driver->hinting_engine = FT_HINTING_ADOBE;
+-#endif
+
+ driver->no_stem_darkening = TRUE;
+
+--
+2.15.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 464c84dd9599..fc71aae8795c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=freetype2-git
pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.8.1+p0+g39ce3ac4
-pkgrel=1
+pkgver=2.8.1+p145+g2c048a8a6
+pkgrel=3
epoch=1
pkgdesc="Font rasterization library (from git)"
arch=(i686 x86_64)
@@ -17,15 +17,17 @@ makedepends=('libx11' 'git' 'python2')
source=(git://git.sv.gnu.org/freetype/freetype2.git
git://git.sv.gnu.org/freetype/freetype2-demos.git
0001-Enable-table-validation-modules.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- 0004-Enable-long-PCF-family-names.patch
+ 0002-Enable-infinality-subpixel-hinting.patch
+ 0003-Enable-long-PCF-family-names.patch
+ 0004-Enable-old-engines-but-keep-adobe-as-default.patch
0005-freetype-2.5.2-more-demos.patch
freetype2.sh)
sha1sums=('SKIP'
'SKIP'
- 'c3e91e668936206d3c158bffde0f69788a086a5b'
- '81586014ea44375ddc85dd9dbcabae6e91c34d62'
- '334f229875039794adeb574e27d365bb445fb314'
+ 'b69531770c343d403be294b7e4d25ac45738c833'
+ '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
+ '770f1981734a837bcf065564c91644b4cc5e256a'
+ '6b551a5df41c9f02152b8456a457392ab5a4367e'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -46,8 +48,9 @@ prepare() {
cd freetype2
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
- patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+ patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
+ patch -Np1 -i ../0004-Enable-old-engines-but-keep-adobe-as-default.patch
./autogen.sh