[arch-commits] Commit in lib32-freetype2/repos/multilib-x86_64 (11 files)
Jan Steffens
heftig at gemini.archlinux.org
Tue Apr 19 06:24:51 UTC 2022
Date: Tuesday, April 19, 2022 @ 06:24:51
Author: heftig
Revision: 1187069
archrelease: copy trunk to multilib-x86_64
Added:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
(from rev 1187068, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 1187068, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch)
lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 1187068, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
lib32-freetype2/repos/multilib-x86_64/0004-Enable-long-PCF-family-names.patch
(from rev 1187068, lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
lib32-freetype2/repos/multilib-x86_64/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch
(from rev 1187068, lib32-freetype2/trunk/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch)
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
(from rev 1187068, 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/0004-Enable-long-PCF-family-names.patch
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-Enable-table-validation-modules.patch | 84 +++---
0002-Enable-subpixel-rendering.patch | 44 +--
0003-Enable-infinality-subpixel-hinting.patch | 48 +--
0004-Enable-long-PCF-family-names.patch | 44 +--
0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch | 28 ++
PKGBUILD | 127 +++++-----
6 files changed, 204 insertions(+), 171 deletions(-)
Deleted: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2022-04-19 06:24:09 UTC (rev 1187068)
+++ 0001-Enable-table-validation-modules.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 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] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index aded92e5e922..f133c65b27e2 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -117,26 +117,26 @@ AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
- #
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
- # 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.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
Copied: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 1187068, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- 0001-Enable-table-validation-modules.patch (rev 0)
+++ 0001-Enable-table-validation-modules.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 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] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index aded92e5e922..f133c65b27e2 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -117,26 +117,26 @@ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
+ #
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # 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.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
Deleted: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch 2022-04-19 06:24:09 UTC (rev 1187068)
+++ 0002-Enable-subpixel-rendering.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 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] 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 c5bde243b127..77d6efb2e5f2 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
- * When this macro is not defined, FreeType offers alternative LCD
- * rendering technology that produces excellent output.
- */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /**************************************************************************
Copied: lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch (from rev 1187068, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- 0002-Enable-subpixel-rendering.patch (rev 0)
+++ 0002-Enable-subpixel-rendering.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 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] 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 c5bde243b127..77d6efb2e5f2 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
+ * When this macro is not defined, FreeType offers alternative LCD
+ * rendering technology that produces excellent output.
+ */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /**************************************************************************
Deleted: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch 2022-04-19 06:24:09 UTC (rev 1187068)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 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] 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 77d6efb2e5f2..c33c51eeb2e7 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -706,8 +706,8 @@ 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 ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /**************************************************************************
Copied: lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 1187068, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 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] 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 77d6efb2e5f2..c33c51eeb2e7 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -706,8 +706,8 @@ 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 ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /**************************************************************************
Deleted: 0004-Enable-long-PCF-family-names.patch
===================================================================
--- 0004-Enable-long-PCF-family-names.patch 2022-04-19 06:24:09 UTC (rev 1187068)
+++ 0004-Enable-long-PCF-family-names.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 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] 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 c33c51eeb2e7..c33ddb4bf60c 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -895,7 +895,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
-
-
- /*************************************************************************/
Copied: lib32-freetype2/repos/multilib-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 1187068, 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 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 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] 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 c33c51eeb2e7..c33ddb4bf60c 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -895,7 +895,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
+
+
+ /*************************************************************************/
Copied: lib32-freetype2/repos/multilib-x86_64/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch (from rev 1187068, lib32-freetype2/trunk/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch)
===================================================================
--- 0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch (rev 0)
+++ 0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Georg Brandl <georg at python.org>
+Date: Tue, 12 Apr 2022 11:43:37 +0000
+Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]:
+ Fix segfault.
+
+This can happen if the function is called with `size` being `NULL`.
+
+Fixes #1147.
+---
+ src/cff/cffgload.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
+index ff0d9cf13611..10855fa41ec1 100644
+--- a/src/cff/cffgload.c
++++ b/src/cff/cffgload.c
+@@ -370,8 +370,8 @@
+ SFNT_Service sfnt;
+
+
+- if ( size->root.metrics.x_ppem < 1 ||
+- size->root.metrics.y_ppem < 1 )
++ if ( size && (size->root.metrics.x_ppem < 1 ||
++ size->root.metrics.y_ppem < 1 ) )
+ {
+ error = FT_THROW( Invalid_Size_Handle );
+ return error;
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-19 06:24:09 UTC (rev 1187068)
+++ PKGBUILD 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -1,61 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=lib32-freetype2
-pkgver=2.12.0
-pkgrel=1
-pkgdesc="Font rasterization library (32-bit)"
-url="https://www.freetype.org/"
-arch=(x86_64)
-license=(GPL)
-# 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 lib32-brotli
- freetype2)
-makedepends=(meson)
-provides=(libfreetype.so)
-options=(debug)
-source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.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)
-sha256sums=('ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033'
- 'SKIP'
- '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da'
- '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f'
- 'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20'
- '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb')
-validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl at gnu.org>
-
-prepare() {
- cd freetype-$pkgver
- 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="i686-pc-linux-gnu-pkg-config"
-
- arch-meson freetype-$pkgver build \
- --libdir=/usr/lib32 \
- -D default_library=shared
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir="$pkgdir"
-
- rm -r "$pkgdir"/usr/include
-}
-
-# vim:set sw=2 et:
Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 1187068, lib32-freetype2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-19 06:24:51 UTC (rev 1187069)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=lib32-freetype2
+pkgver=2.12.0
+pkgrel=2
+pkgdesc="Font rasterization library (32-bit)"
+url="https://www.freetype.org/"
+arch=(x86_64)
+license=(GPL)
+# 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 lib32-brotli
+ freetype2)
+makedepends=(meson)
+provides=(libfreetype.so)
+options=(debug)
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.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
+ 0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch)
+sha256sums=('ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033'
+ 'SKIP'
+ '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da'
+ '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f'
+ 'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20'
+ '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb'
+ '36efbbdf3dd01a4d1d70587d65b6067d73afae9780b87933db23f18251fbb00c')
+validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl at gnu.org>
+
+prepare() {
+ cd freetype-$pkgver
+ 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
+
+ # https://bugs.archlinux.org/task/74499
+ patch -Np1 -i ../0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+ arch-meson freetype-$pkgver build \
+ --libdir=/usr/lib32 \
+ -D default_library=shared
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir="$pkgdir"
+
+ rm -r "$pkgdir"/usr/include
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list