Date: Tuesday, April 19, 2022 @ 06:24:58 Author: heftig Revision: 442911
archrelease: copy trunk to extra-x86_64 Added: freetype2/repos/extra-x86_64/0001-Enable-table-validation-modules.patch (from rev 442910, freetype2/trunk/0001-Enable-table-validation-modules.patch) freetype2/repos/extra-x86_64/0002-Enable-subpixel-rendering.patch (from rev 442910, freetype2/trunk/0002-Enable-subpixel-rendering.patch) freetype2/repos/extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 442910, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch) freetype2/repos/extra-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 442910, freetype2/trunk/0004-Enable-long-PCF-family-names.patch) freetype2/repos/extra-x86_64/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch (from rev 442910, freetype2/trunk/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch) freetype2/repos/extra-x86_64/PKGBUILD (from rev 442910, freetype2/trunk/PKGBUILD) freetype2/repos/extra-x86_64/freetype2.install (from rev 442910, freetype2/trunk/freetype2.install) freetype2/repos/extra-x86_64/freetype2.sh (from rev 442910, freetype2/trunk/freetype2.sh) Deleted: freetype2/repos/extra-x86_64/0001-Enable-table-validation-modules.patch freetype2/repos/extra-x86_64/0002-Enable-subpixel-rendering.patch freetype2/repos/extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch freetype2/repos/extra-x86_64/0004-Enable-long-PCF-family-names.patch freetype2/repos/extra-x86_64/PKGBUILD freetype2/repos/extra-x86_64/freetype2.install freetype2/repos/extra-x86_64/freetype2.sh -----------------------------------------------------------------+ 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 | 199 +++++----- freetype2.install | 16 freetype2.sh | 24 - 8 files changed, 260 insertions(+), 227 deletions(-) Deleted: 0001-Enable-table-validation-modules.patch =================================================================== --- 0001-Enable-table-validation-modules.patch 2022-04-19 06:24:31 UTC (rev 442910) +++ 0001-Enable-table-validation-modules.patch 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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: freetype2/repos/extra-x86_64/0001-Enable-table-validation-modules.patch (from rev 442910, 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:58 UTC (rev 442911) @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@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:31 UTC (rev 442910) +++ 0002-Enable-subpixel-rendering.patch 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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: freetype2/repos/extra-x86_64/0002-Enable-subpixel-rendering.patch (from rev 442910, freetype2/trunk/0002-Enable-subpixel-rendering.patch) =================================================================== --- 0002-Enable-subpixel-rendering.patch (rev 0) +++ 0002-Enable-subpixel-rendering.patch 2022-04-19 06:24:58 UTC (rev 442911) @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@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:31 UTC (rev 442910) +++ 0003-Enable-infinality-subpixel-hinting.patch 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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: freetype2/repos/extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 442910, 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:58 UTC (rev 442911) @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@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:31 UTC (rev 442910) +++ 0004-Enable-long-PCF-family-names.patch 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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: freetype2/repos/extra-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 442910, 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:58 UTC (rev 442911) @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@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: freetype2/repos/extra-x86_64/0005-src-cff-cffgload.c-cff_slot_load-FT_CONFIG_OPTION_SV.patch (from rev 442910, 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:58 UTC (rev 442911) @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Georg Brandl <ge...@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:31 UTC (rev 442910) +++ PKGBUILD 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,97 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgbase=freetype2 -pkgname=(freetype2 freetype2-demos freetype2-docs) -pkgver=2.12.0 -pkgrel=1 -pkgdesc="Font rasterization library" -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=(zlib bzip2 sh libpng harfbuzz brotli) -makedepends=(libx11 qt5-base meson librsvg) -options=(debug) -source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig} - https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-$pkgver.tar.xz{,.sig} - https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-$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 - freetype2.sh) -sha256sums=('ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033' - 'SKIP' - '22cf273cba41da07b7414a82a3ae701df1239e29928f0b8c42d08c5ef98dc01d' - 'SKIP' - 'dbc7ecaebc8c1658e4cc9e04e5978bba35375f664e87b857ca67451ab6b372d3' - 'SKIP' - '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da' - '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f' - 'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20' - '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb' - 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467') -validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <w...@gnu.org> - -prepare() { - ln -sr freetype-$pkgver ft2demos-$pkgver/subprojects/freetype2 - - 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() { - arch-meson ft2demos-$pkgver build \ - -D freetype2:default_library=shared - meson compile -C build -} - -check() { - meson test -C build --print-errorlogs -} - -_pick() { - local p="$1" f d; shift - for f; do - d="$srcdir/$p/${f#$pkgdir/}" - mkdir -p "$(dirname "$d")" - mv "$f" "$d" - rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" - done -} - -package_freetype2() { - provides=(libfreetype.so) - install=freetype2.install - backup=(etc/profile.d/freetype2.sh) - - meson install -C build --destdir="$pkgdir" - install -Dt "$pkgdir/etc/profile.d" -m644 freetype2.sh - install -Dt "$pkgdir/usr/share/aclocal" -m644 \ - freetype-$pkgver/builds/unix/freetype2.m4 - - _pick demos "$pkgdir"/usr/bin - _pick demos "$pkgdir"/usr/share/man/man1 -} - -package_freetype2-demos() { - pkgdesc="Freetype tools and demos" - depends=(freetype2 libx11 librsvg) - optdepends=('qt5-base: ftinspect') - mv demos/* "$pkgdir" -} - -package_freetype2-docs() { - pkgdesc="Freetype documentation" - depends=(freetype2) - - mkdir -p "${pkgdir}/usr/share/doc" - cp -r freetype-$pkgver/docs "$pkgdir/usr/share/doc/$pkgbase" -} - -# vim:set sw=2 et: Copied: freetype2/repos/extra-x86_64/PKGBUILD (from rev 442910, freetype2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-04-19 06:24:58 UTC (rev 442911) @@ -0,0 +1,102 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgbase=freetype2 +pkgname=(freetype2 freetype2-demos freetype2-docs) +pkgver=2.12.0 +pkgrel=2 +pkgdesc="Font rasterization library" +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=(zlib bzip2 sh libpng harfbuzz brotli) +makedepends=(libx11 qt5-base meson librsvg) +options=(debug) +source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig} + https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-$pkgver.tar.xz{,.sig} + https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-$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 + freetype2.sh) +sha256sums=('ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033' + 'SKIP' + '22cf273cba41da07b7414a82a3ae701df1239e29928f0b8c42d08c5ef98dc01d' + 'SKIP' + 'dbc7ecaebc8c1658e4cc9e04e5978bba35375f664e87b857ca67451ab6b372d3' + 'SKIP' + '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da' + '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f' + 'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20' + '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb' + '36efbbdf3dd01a4d1d70587d65b6067d73afae9780b87933db23f18251fbb00c' + 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467') +validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <w...@gnu.org> + +prepare() { + ln -sr freetype-$pkgver ft2demos-$pkgver/subprojects/freetype2 + + 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() { + arch-meson ft2demos-$pkgver build \ + -D freetype2:default_library=shared + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +package_freetype2() { + provides=(libfreetype.so) + install=freetype2.install + backup=(etc/profile.d/freetype2.sh) + + meson install -C build --destdir="$pkgdir" + install -Dt "$pkgdir/etc/profile.d" -m644 freetype2.sh + install -Dt "$pkgdir/usr/share/aclocal" -m644 \ + freetype-$pkgver/builds/unix/freetype2.m4 + + _pick demos "$pkgdir"/usr/bin + _pick demos "$pkgdir"/usr/share/man/man1 +} + +package_freetype2-demos() { + pkgdesc="Freetype tools and demos" + depends=(freetype2 libx11 librsvg) + optdepends=('qt5-base: ftinspect') + mv demos/* "$pkgdir" +} + +package_freetype2-docs() { + pkgdesc="Freetype documentation" + depends=(freetype2) + + mkdir -p "${pkgdir}/usr/share/doc" + cp -r freetype-$pkgver/docs "$pkgdir/usr/share/doc/$pkgbase" +} + +# vim:set sw=2 et: Deleted: freetype2.install =================================================================== --- freetype2.install 2022-04-19 06:24:31 UTC (rev 442910) +++ freetype2.install 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,8 +0,0 @@ -post_upgrade() { - if (( $(vercmp $2 2.7-1) < 0 )); then - cat <<MSG - The Arch-specific FT2_SUBPIXEL_HINTING has been removed. - Subpixel hinting is now configured in /etc/profile.d/freetype2.sh . -MSG - fi -} Copied: freetype2/repos/extra-x86_64/freetype2.install (from rev 442910, freetype2/trunk/freetype2.install) =================================================================== --- freetype2.install (rev 0) +++ freetype2.install 2022-04-19 06:24:58 UTC (rev 442911) @@ -0,0 +1,8 @@ +post_upgrade() { + if (( $(vercmp $2 2.7-1) < 0 )); then + cat <<MSG + The Arch-specific FT2_SUBPIXEL_HINTING has been removed. + Subpixel hinting is now configured in /etc/profile.d/freetype2.sh . +MSG + fi +} Deleted: freetype2.sh =================================================================== --- freetype2.sh 2022-04-19 06:24:31 UTC (rev 442910) +++ freetype2.sh 2022-04-19 06:24:58 UTC (rev 442911) @@ -1,12 +0,0 @@ -# Subpixel hinting mode can be chosen by setting the right TrueType interpreter -# version. The available settings are: -# -# truetype:interpreter-version=35 # Classic mode (default in 2.6) -# truetype:interpreter-version=38 # Infinality mode -# truetype:interpreter-version=40 # Minimal mode (default in 2.7) -# -# There are more properties that can be set, separated by whitespace. Please -# refer to the FreeType documentation for details. - -# Uncomment and configure below -#export FREETYPE_PROPERTIES="truetype:interpreter-version=40" Copied: freetype2/repos/extra-x86_64/freetype2.sh (from rev 442910, freetype2/trunk/freetype2.sh) =================================================================== --- freetype2.sh (rev 0) +++ freetype2.sh 2022-04-19 06:24:58 UTC (rev 442911) @@ -0,0 +1,12 @@ +# Subpixel hinting mode can be chosen by setting the right TrueType interpreter +# version. The available settings are: +# +# truetype:interpreter-version=35 # Classic mode (default in 2.6) +# truetype:interpreter-version=38 # Infinality mode +# truetype:interpreter-version=40 # Minimal mode (default in 2.7) +# +# There are more properties that can be set, separated by whitespace. Please +# refer to the FreeType documentation for details. + +# Uncomment and configure below +#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"