[arch-commits] Commit in lib32-freetype2/repos/multilib-x86_64 (11 files)
Jan Steffens
heftig at archlinux.org
Wed May 31 19:37:10 UTC 2017
Date: Wednesday, May 31, 2017 @ 19:37:10
Author: heftig
Revision: 231633
archrelease: copy trunk to multilib-x86_64
Added:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
(from rev 231632, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 231632, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch)
lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 231632, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
lib32-freetype2/repos/multilib-x86_64/0004-Enable-long-PCF-family-names.patch
(from rev 231632, lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
(from rev 231632, lib32-freetype2/trunk/PKGBUILD)
Deleted:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch
lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch
lib32-freetype2/repos/multilib-x86_64/CVE-2017-8105.patch
lib32-freetype2/repos/multilib-x86_64/CVE-2017-8287.patch
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
-----------------------------------------------+
0001-Enable-table-validation-modules.patch | 83 +++++++++------
0002-Enable-subpixel-rendering.patch | 50 ++++-----
0003-Enable-infinality-subpixel-hinting.patch | 54 +++++-----
0004-Enable-long-PCF-family-names.patch | 25 ++++
CVE-2017-8105.patch | 47 --------
CVE-2017-8287.patch | 35 ------
PKGBUILD | 128 +++++++++++-------------
7 files changed, 188 insertions(+), 234 deletions(-)
Deleted: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2017-05-31 19:36:34 UTC (rev 231632)
+++ 0001-Enable-table-validation-modules.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -1,34 +0,0 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-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 f30049c38cc45159..7b8e50fe1b34584a 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -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).
- #
-@@ -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.3
-
Copied: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 231632, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- 0001-Enable-table-validation-modules.patch (rev 0)
+++ 0001-Enable-table-validation-modules.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -0,0 +1,49 @@
+From 17dd2751813c3c8b37dac474cc5024473eb9bece Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+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 517111efeb642459..64b2a34d510ce8f7 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -120,30 +120,30 @@ 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).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ 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.13.0
+
Deleted: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch 2017-05-31 19:36:34 UTC (rev 231632)
+++ 0002-Enable-subpixel-rendering.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -1,25 +0,0 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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. */
- /* */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch (from rev 231632, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- 0002-Enable-subpixel-rendering.patch (rev 0)
+++ 0002-Enable-subpixel-rendering.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -0,0 +1,25 @@
+From a8f7f3068a8a5f94adfc77f4ddf03bf08da38f9b Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/4] 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 1bf6e8f534ff0734..1126716626b570df 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. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
+--
+2.13.0
+
Deleted: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch 2017-05-31 19:36:34 UTC (rev 231632)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -1,27 +0,0 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/3] 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 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 */
- /* */
- /* #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 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 231632, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -0,0 +1,27 @@
+From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/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
+--- 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 */
+ /* */
+ /* #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 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /*************************************************************************/
+--
+2.13.0
+
Copied: lib32-freetype2/repos/multilib-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 231632, lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
===================================================================
--- 0004-Enable-long-PCF-family-names.patch (rev 0)
+++ 0004-Enable-long-PCF-family-names.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -0,0 +1,25 @@
+From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 4/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
+--- 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. */
+ /* */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+
+ /*************************************************************************/
+--
+2.13.0
+
Deleted: CVE-2017-8105.patch
===================================================================
--- CVE-2017-8105.patch 2017-05-31 19:36:34 UTC (rev 231632)
+++ CVE-2017-8105.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -1,47 +0,0 @@
-From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl at gnu.org>
-Date: Fri, 24 Mar 2017 09:15:10 +0100
-Subject: [psaux] Better protect `flex' handling.
-
-Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935
-
-* src/psaux/t1decode.c (t1_decoder_parse_charstrings)
-<callothersubr>: Since there is not a single flex operator but a
-series of subroutine calls, malformed fonts can call arbitrary other
-operators after the start of a flex, possibly adding points. For
-this reason we have to check the available number of points before
-inserting a point.
----
- ChangeLog | 15 +++++++++++++++
- src/psaux/t1decode.c | 9 +++++++++
- 2 files changed, 24 insertions(+)
-
-diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
-index af7b465..7dd4513 100644
---- a/src/psaux/t1decode.c
-+++ b/src/psaux/t1decode.c
-@@ -780,10 +780,19 @@
- /* point without adding any point to the outline */
- idx = decoder->num_flex_vectors++;
- if ( idx > 0 && idx < 7 )
-+ {
-+ /* in malformed fonts it is possible to have other */
-+ /* opcodes in the middle of a flex (which don't */
-+ /* increase `num_flex_vectors'); we thus have to */
-+ /* check whether we can add a point */
-+ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
-+ goto Syntax_Error;
-+
- t1_builder_add_point( builder,
- x,
- y,
- (FT_Byte)( idx == 3 || idx == 6 ) );
-+ }
- }
- break;
-
---
-cgit v1.0-41-gc330
-
Deleted: CVE-2017-8287.patch
===================================================================
--- CVE-2017-8287.patch 2017-05-31 19:36:34 UTC (rev 231632)
+++ CVE-2017-8287.patch 2017-05-31 19:37:10 UTC (rev 231633)
@@ -1,35 +0,0 @@
-From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl at gnu.org>
-Date: Sun, 26 Mar 2017 08:32:09 +0200
-Subject: * src/psaux/psobjs.c (t1_builder_close_contour): Add safety guard.
-
-Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
----
- ChangeLog | 8 ++++++++
- src/psaux/psobjs.c | 8 ++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
-index d18e821..0baf836 100644
---- a/src/psaux/psobjs.c
-+++ b/src/psaux/psobjs.c
-@@ -1718,6 +1718,14 @@
- first = outline->n_contours <= 1
- ? 0 : outline->contours[outline->n_contours - 2] + 1;
-
-+ /* in malformed fonts it can happen that a contour was started */
-+ /* but no points were added */
-+ if ( outline->n_contours && first == outline->n_points )
-+ {
-+ outline->n_contours--;
-+ return;
-+ }
-+
- /* We must not include the last point in the path if it */
- /* is located on the first point. */
- if ( outline->n_points > 1 )
---
-cgit v1.0-41-gc330
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-05-31 19:36:34 UTC (rev 231632)
+++ PKGBUILD 2017-05-31 19:37:10 UTC (rev 231633)
@@ -1,66 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.7.1
-pkgrel=2
-pkgdesc="TrueType font rendering library (32-bit)"
-arch=(x86_64)
-license=('GPL')
-url="http://www.freetype.org/"
-# adding harfbuzz for improved OpenType features auto-hinting
-# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
-makedepends=('gcc-multilib')
-provides=('libfreetype.so')
-source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-subpixel-rendering.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- CVE-2017-8105.patch
- CVE-2017-8287.patch)
-sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
- 'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
- '9ff76b0d0a079872279a62300af7806b15b6a51a'
- '049ed3cb4471596396660896a8ccd95288001d8f')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
- # Rename source dir to allow building the demos
- mv freetype-${pkgver} freetype2
-
- cd freetype2
- patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-
- patch -Np1 -i ../CVE-2017-8105.patch
- patch -Np1 -i ../CVE-2017-8287.patch
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd freetype2
- ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package() {
- cd freetype2
- make DESTDIR="${pkgdir}" install
-
- rm -r "${pkgdir}"/usr/{include,share,bin}
-}
Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 231632, lib32-freetype2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-05-31 19:37:10 UTC (rev 231633)
@@ -0,0 +1,62 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=freetype2
+pkgname=lib32-$_pkgbasename
+pkgver=2.8
+pkgrel=2
+pkgdesc="TrueType font rendering library (32-bit)"
+arch=(x86_64)
+license=('GPL')
+url="https://www.freetype.org/"
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
+makedepends=('gcc-multilib')
+provides=('libfreetype.so')
+source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0004-Enable-long-PCF-family-names.patch)
+sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
+ 'SKIP'
+ 'c3e91e668936206d3c158bffde0f69788a086a5b'
+ '4ff958229a7f87e04a9894d5a6ed2df227071931'
+ '81586014ea44375ddc85dd9dbcabae6e91c34d62'
+ '334f229875039794adeb574e27d365bb445fb314')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd freetype2
+ ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package() {
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "${pkgdir}"/usr/{include,share,bin}
+}
More information about the arch-commits
mailing list