Date: Sunday, July 25, 2021 @ 19:52:48 Author: andyrtr Revision: 420391
upgpkg: freetype2 2.11.0-2: apply upstream build fix to include missing "ttdebug" Added: freetype2/trunk/0005-ft2-demos-meson-fixes.patch Modified: freetype2/trunk/PKGBUILD ----------------------------------+ 0005-ft2-demos-meson-fixes.patch | 150 +++++++++++++++++++++++++++++++++++++ PKGBUILD | 13 ++- 2 files changed, 159 insertions(+), 4 deletions(-) Added: 0005-ft2-demos-meson-fixes.patch =================================================================== --- 0005-ft2-demos-meson-fixes.patch (rev 0) +++ 0005-ft2-demos-meson-fixes.patch 2021-07-25 19:52:48 UTC (rev 420391) @@ -0,0 +1,150 @@ +diff --git a/meson.build b/meson.build +index fc2d29f9e86551ebb332876d50950e0935b87bce..c425afea09016c6334231bd3e426d605f05fd329 100644 +--- a/meson.build ++++ b/meson.build +@@ -76,25 +76,8 @@ ftcommon_lib = static_library('ftcommon', + link_with: [common_lib, graph_lib], + ) + +-executable('fttimer', +- 'src/fttimer.c', +- dependencies: libfreetype2_dep, +- install: false) +- +-executable('ftchkwd', +- 'src/ftchkwd.c', +- dependencies: libfreetype2_dep, +- install: false) + +-executable('ftmemchk', +- 'src/ftmemchk.c', +- dependencies: libfreetype2_dep, +- install: false) +- +-executable('ftpatchk', +- 'src/ftpatchk.c', +- dependencies: libfreetype2_dep, +- install: false) ++# programs + + executable('ftbench', + 'src/ftbench.c', +@@ -102,17 +85,10 @@ executable('ftbench', + link_with: common_lib, + install: true) + +-executable('ftdump', +- 'src/ftdump.c', +- dependencies: libfreetype2_dep, +- link_with: [common_lib, output_lib], +- install: true) +- +-executable('ftlint', +- 'src/ftlint.c', ++executable('ftchkwd', ++ 'src/ftchkwd.c', + dependencies: libfreetype2_dep, +- link_with: common_lib, +- install: true) ++ install: false) + + executable('ftdiff', + 'src/ftdiff.c', +@@ -121,6 +97,12 @@ executable('ftdiff', + link_with: ftcommon_lib, + install: true) + ++executable('ftdump', ++ 'src/ftdump.c', ++ dependencies: libfreetype2_dep, ++ link_with: [common_lib, output_lib], ++ install: true) ++ + executable('ftgamma', + 'src/ftgamma.c', + dependencies: [libfreetype2_dep, math_dep], +@@ -135,6 +117,17 @@ executable('ftgrid', + link_with: [ftcommon_lib, output_lib], + install: true) + ++executable('ftlint', ++ 'src/ftlint.c', ++ dependencies: libfreetype2_dep, ++ link_with: common_lib, ++ install: true) ++ ++executable('ftmemchk', ++ 'src/ftmemchk.c', ++ dependencies: libfreetype2_dep, ++ install: false) ++ + executable('ftmulti', + 'src/ftmulti.c', + dependencies: libfreetype2_dep, +@@ -142,6 +135,11 @@ executable('ftmulti', + link_with: ftcommon_lib, + install: true) + ++executable('ftpatchk', ++ 'src/ftpatchk.c', ++ dependencies: libfreetype2_dep, ++ install: false) ++ + executable('ftsdf', + 'src/ftsdf.c', + dependencies: libfreetype2_dep, +@@ -156,12 +154,10 @@ executable('ftstring', + link_with: ftcommon_lib, + install: true) + +-executable('ftview', +- 'src/ftview.c', ++executable('fttimer', ++ 'src/fttimer.c', + dependencies: libfreetype2_dep, +- include_directories: graph_include_dir, +- link_with: ftcommon_lib, +- install: true) ++ install: false) + + executable('ftvalid', + 'src/ftvalid.c', +@@ -169,6 +165,14 @@ executable('ftvalid', + link_with: common_lib, + install: true) + ++executable('ftview', ++ 'src/ftview.c', ++ dependencies: libfreetype2_dep, ++ include_directories: graph_include_dir, ++ link_with: ftcommon_lib, ++ install: true) ++ ++ + install_man([ + 'man/ftbench.1', + 'man/ftdiff.1', +diff --git a/meson.build b/meson.build +index c425afea09016c6334231bd3e426d605f05fd329..36d0309ed75c5e3a3cfa79276800832e2e9eae7c 100644 +--- a/meson.build ++++ b/meson.build +@@ -172,6 +172,19 @@ executable('ftview', + link_with: ftcommon_lib, + install: true) + ++# This program only works if FreeType has been compiled with enabled option ++# `TT_CONFIG_OPTION_BYTECODE_INTERPRETER` (which is the default). ++# ++# We need a path into FreeType's `src/truetype` directory. This is ++# something normal applications should never need. ++executable('ttdebug', ++ 'src/ttdebug.c', ++ dependencies: libfreetype2_dep, ++ c_args: '-DFT2_BUILD_LIBRARY=1', ++ include_directories: 'subprojects/freetype2/src/truetype', ++ link_with: common_lib, ++ install: true) ++ + + install_man([ + 'man/ftbench.1', Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-25 19:25:43 UTC (rev 420390) +++ PKGBUILD 2021-07-25 19:52:48 UTC (rev 420391) @@ -4,7 +4,7 @@ pkgbase=freetype2 pkgname=(freetype2 freetype2-demos freetype2-docs) pkgver=2.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Font rasterization library" url="https://www.freetype.org/" arch=(x86_64) @@ -20,6 +20,7 @@ 0002-Enable-subpixel-rendering.patch 0003-Enable-infinality-subpixel-hinting.patch 0004-Enable-long-PCF-family-names.patch + 0005-ft2-demos-meson-fixes.patch freetype2.sh) sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7' 'SKIP' @@ -31,18 +32,22 @@ '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468' '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a' '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6' + '7b1268c229414bc75c50fa826a0f8d391c15568742bca10afd8c12f0c61e5597' 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467') validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <w...@gnu.org> prepare() { - cd freetype-$pkgver - + pushd 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 + ln -sr . ../ft2demos-$pkgver/subprojects/freetype2 + popd - ln -sr . ../ft2demos-$pkgver/subprojects/freetype2 + pushd ft2demos-$pkgver + patch -Np1 -i ../0005-ft2-demos-meson-fixes.patch + popd } build() {