summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Enable-table-validation-modules.patch32
-rw-r--r--0001-psaux-Correctly-handle-Flex-features-52846.patch38
-rw-r--r--0002-Enable-subpixel-rendering.patch31
-rw-r--r--0003-Enable-v35-subpixel-hinting.patch16
-rw-r--r--0004-Enable-long-PCF-family-names.patch19
-rw-r--r--PKGBUILD17
7 files changed, 65 insertions, 110 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0dd6b7c2cf9b..f7b784e6003d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.0.2
-# Thu Feb 1 09:55:09 UTC 2018
+# Generated by mksrcinfo v8
+# Thu Mar 21 10:11:40 UTC 2019
pkgbase = lib32-freetype2-v35
pkgdesc = TrueType font rendering library with v35 bytecode interpreter only
- pkgver = 2.9
+ pkgver = 2.10.0
pkgrel = 1
url = http://www.freetype.org/
arch = i686
@@ -15,20 +15,18 @@ pkgbase = lib32-freetype2-v35
depends = lib32-harfbuzz
depends = freetype2-v35
provides = libfreetype.so
- provides = lib32-freetype2=2.9
+ provides = lib32-freetype2=2.10.0
conflicts = lib32-freetype2
- source = https://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2
+ source = https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-subpixel-rendering.patch
source = 0003-Enable-v35-subpixel-hinting.patch
source = 0004-Enable-long-PCF-family-names.patch
- source = 0001-psaux-Correctly-handle-Flex-features-52846.patch
- sha1sums = 94c4399b1a55c5892812e732843fcb4a7c2fe657
- sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
- sha1sums = b1494810ed3aca25cdd8e8cedf634e5adfe6c09e
- sha1sums = 5237bd234d7bb359dadb28e804115f07bbbdfb13
- sha1sums = 334f229875039794adeb574e27d365bb445fb314
- sha1sums = 21ad7dd31e16adb5b39adfa5671018a736626562
+ sha1sums = f6abf03e0e3189a0de883981c57d3861b5d314f5
+ sha1sums = 46fd67e6a594f6c2c473b9321ba64913984ba42f
+ sha1sums = 57b1671593684712a555ac5a42bf22f2b85dbe1b
+ sha1sums = 8b7911d96f9854ee139b82a88c1ba634e11873ec
+ sha1sums = af76172be8135e74391b7ad1b82c2124ae0ad86c
pkgname = lib32-freetype2-v35
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 3e9451fa8b82..2c38e8f5b665 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,34 +1,46 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
+From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001
+Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.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/3] Enable table validation modules
+Subject: [PATCH 1/4] Enable table validation modules
---
modules.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index f30049c38cc45159..7b8e50fe1b34584a 100644
+index dc6c8d42d..2ab145016 100644
--- a/modules.cfg
+++ b/modules.cfg
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
+@@ -111,26 +111,26 @@ 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).
#
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
- # OpenType table validation. Needs ftotval.c below.
+ # See include/freetype/ftgzip.h for the API.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ 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.3
+2.21.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 44630fbdcf1f..000000000000
--- 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-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index dfb57966e2ff..34a533b5935b 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,25 +1,12 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 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/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 90c123ef93e9ea04..67a361dd41e0b026 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -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. */
- /* */
+diff -pudr a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+--- a/include/freetype/config/ftoption.h 2019-02-23 12:09:06.000000000 +0300
++++ b/include/freetype/config/ftoption.h 2019-03-21 12:44:40.553974923 +0300
+@@ -126,7 +126,7 @@ FT_BEGIN_HEADER
+ * macro is not defined, FreeType offers alternative LCD rendering
+ * technology that produces excellent output without LCD filtering.
+ */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
++ #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- /*************************************************************************/
---
-2.9.3
-
+ /**************************************************************************
diff --git a/0003-Enable-v35-subpixel-hinting.patch b/0003-Enable-v35-subpixel-hinting.patch
index 714565b71970..c025e0efdea6 100644
--- a/0003-Enable-v35-subpixel-hinting.patch
+++ b/0003-Enable-v35-subpixel-hinting.patch
@@ -1,14 +1,12 @@
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 67a361dd41e0b026..c4812862518b66a6 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
- /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
- /* */
+diff -pudr a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+--- a/include/freetype/config/ftoption.h 2019-03-21 12:46:59.724994096 +0300
++++ b/include/freetype/config/ftoption.h 2019-03-21 12:47:29.256015057 +0300
+@@ -658,7 +658,7 @@ FT_BEGIN_HEADER
+ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+ */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
- /*************************************************************************/
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 675423a7c472..916fe9cf141f 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -1,25 +1,28 @@
-From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001
+Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com>
+In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.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 1d4469a99..4ff4e7821 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -865,7 +865,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. */
- /* */
+@@ -847,7 +847,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.
+ */
-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
/*************************************************************************/
--
-2.13.0
+2.21.0
diff --git a/PKGBUILD b/PKGBUILD
index 81d71f464f1f..b306dbeef96a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_pkgname=freetype2
_pkgbasename=${_pkgname}-v35
pkgname=lib32-${_pkgbasename}
-pkgver=2.9
+pkgver=2.10.0
pkgrel=1
pkgdesc="TrueType font rendering library with v35 bytecode interpreter only"
arch=(i686 x86_64)
@@ -22,14 +22,12 @@ source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.t
0002-Enable-subpixel-rendering.patch
0003-Enable-v35-subpixel-hinting.patch
0004-Enable-long-PCF-family-names.patch
- 0001-psaux-Correctly-handle-Flex-features-52846.patch
)
-sha1sums=('94c4399b1a55c5892812e732843fcb4a7c2fe657'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '5237bd234d7bb359dadb28e804115f07bbbdfb13'
- '334f229875039794adeb574e27d365bb445fb314'
- '21ad7dd31e16adb5b39adfa5671018a736626562'
+sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5'
+ '46fd67e6a594f6c2c473b9321ba64913984ba42f'
+ '57b1671593684712a555ac5a42bf22f2b85dbe1b'
+ '8b7911d96f9854ee139b82a88c1ba634e11873ec'
+ 'af76172be8135e74391b7ad1b82c2124ae0ad86c'
)
prepare() {
@@ -38,9 +36,6 @@ prepare() {
patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
patch -Np1 -i ../0003-Enable-v35-subpixel-hinting.patch
patch -Np1 -i ../0004-Enable-long-PCF-family-names.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
}
build() {