Date: Sunday, May 1, 2022 @ 09:05:54 Author: heftig Revision: 1192038
2.12.1-1 Modified: lib32-freetype2/trunk/PKGBUILD Deleted: 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 | 28 ---------- PKGBUILD | 15 +---- 2 files changed, 5 insertions(+), 38 deletions(-) Deleted: 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 2022-05-01 08:40:38 UTC (rev 1192037) +++ 0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch 2022-05-01 09:05:54 UTC (rev 1192038) @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Georg Brandl <[email protected]> -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; Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-01 08:40:38 UTC (rev 1192037) +++ PKGBUILD 2022-05-01 09:05:54 UTC (rev 1192038) @@ -3,8 +3,8 @@ # Contributor: Jan de Groot <[email protected]> pkgname=lib32-freetype2 -pkgver=2.12.0 -pkgrel=2 +pkgver=2.12.1 +pkgrel=1 pkgdesc="Font rasterization library (32-bit)" url="https://www.freetype.org/"; arch=(x86_64) @@ -20,15 +20,13 @@ 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' + 0004-Enable-long-PCF-family-names.patch) +sha256sums=('4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f' 'SKIP' '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da' '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f' 'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20' - '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb' - '36efbbdf3dd01a4d1d70587d65b6067d73afae9780b87933db23f18251fbb00c') + '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb') validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <[email protected]> prepare() { @@ -37,9 +35,6 @@ 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() {
