Date: Saturday, October 10, 2020 @ 20:20:36 Author: heftig Revision: 397935
2.10.3-1 Added: freetype2/trunk/0002-Enable-subpixel-rendering.patch freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch (from rev 382962, freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch) freetype2/trunk/0004-Enable-long-PCF-family-names.patch (from rev 382962, freetype2/trunk/0003-Enable-long-PCF-family-names.patch) Modified: freetype2/trunk/0001-Enable-table-validation-modules.patch freetype2/trunk/PKGBUILD Deleted: freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch freetype2/trunk/0003-Enable-long-PCF-family-names.patch freetype2/trunk/freetype-2.5.2-more-demos.patch -----------------------------------------------+ 0001-Enable-table-validation-modules.patch | 7 -- 0002-Enable-infinality-subpixel-hinting.patch | 27 -------- 0002-Enable-subpixel-rendering.patch | 22 ++++++ 0003-Enable-infinality-subpixel-hinting.patch | 24 +++++++ 0003-Enable-long-PCF-family-names.patch | 25 ------- 0004-Enable-long-PCF-family-names.patch | 22 ++++++ PKGBUILD | 76 ++++++++++++------------ freetype-2.5.2-more-demos.patch | 17 ----- 8 files changed, 108 insertions(+), 112 deletions(-) Modified: 0001-Enable-table-validation-modules.patch =================================================================== --- 0001-Enable-table-validation-modules.patch 2020-10-10 19:47:52 UTC (rev 397934) +++ 0001-Enable-table-validation-modules.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -1,7 +1,7 @@ -From c29e554b370dd9e283a53b81527434415f4572c2 Mon Sep 17 00:00:00 2001 +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 1/3] Enable table validation modules +Subject: [PATCH] Enable table validation modules --- modules.cfg | 4 ++-- @@ -40,6 +40,3 @@ # Auxiliary PostScript driver component to share common code. # --- -2.26.2 - Deleted: 0002-Enable-infinality-subpixel-hinting.patch =================================================================== --- 0002-Enable-infinality-subpixel-hinting.patch 2020-10-10 19:47:52 UTC (rev 397934) +++ 0002-Enable-infinality-subpixel-hinting.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -1,27 +0,0 @@ -From 9f26c483bbc0e96967963905ea824e20a0f30778 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 2/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 426806d2e..1cadffe8a 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -674,8 +674,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 ) - - - /************************************************************************** --- -2.26.2 - Added: 0002-Enable-subpixel-rendering.patch =================================================================== --- 0002-Enable-subpixel-rendering.patch (rev 0) +++ 0002-Enable-subpixel-rendering.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -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 097f19b8a..e5de62e35 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -124,7 +124,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/trunk/0003-Enable-infinality-subpixel-hinting.patch (from rev 382962, freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch) =================================================================== --- 0003-Enable-infinality-subpixel-hinting.patch (rev 0) +++ 0003-Enable-infinality-subpixel-hinting.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -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 e5de62e35..acb4d6d6a 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -672,8 +672,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: 0003-Enable-long-PCF-family-names.patch =================================================================== --- 0003-Enable-long-PCF-family-names.patch 2020-10-10 19:47:52 UTC (rev 397934) +++ 0003-Enable-long-PCF-family-names.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -1,25 +0,0 @@ -From cd916f63dc53e7116aa99c4775e13caca7b3c59c 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 3/3] 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 1cadffe8a..569d1c638 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -863,7 +863,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.26.2 - Copied: freetype2/trunk/0004-Enable-long-PCF-family-names.patch (from rev 382962, freetype2/trunk/0003-Enable-long-PCF-family-names.patch) =================================================================== --- 0004-Enable-long-PCF-family-names.patch (rev 0) +++ 0004-Enable-long-PCF-family-names.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -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 acb4d6d6a..efa13b9c6 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -861,7 +861,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 + + + /*************************************************************************/ Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-10 19:47:52 UTC (rev 397934) +++ PKGBUILD 2020-10-10 20:20:36 UTC (rev 397935) @@ -1,51 +1,51 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> # Maintainer: Jan de Groot <j...@archlinux.org> pkgbase=freetype2 -pkgname=('freetype2' 'freetype2-demos' 'freetype2-docs') -pkgver=2.10.2 +pkgname=(freetype2 freetype2-demos freetype2-docs) +pkgver=2.10.3 pkgrel=1 pkgdesc="Font rasterization library" +url="https://www.freetype.org/" arch=(x86_64) -license=('GPL') -url="https://www.freetype.org/" +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') -makedepends=('libx11') -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} +depends=(zlib bzip2 sh libpng harfbuzz) +makedepends=(libx11) +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-infinality-subpixel-hinting.patch - 0003-Enable-long-PCF-family-names.patch - freetype-2.5.2-more-demos.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-infinality-subpixel-hinting.patch + 0004-Enable-long-PCF-family-names.patch freetype2.sh) -sha1sums=('b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875' - 'SKIP' - '97060579e8e66ff870e07567cba3c21e5b6f0e1a' - 'SKIP' - '7b2001a0269be6c619d81d21944dd054fa9f2328' - 'SKIP' - '43919bfbf8fcc0e8df2659af6a1f09d338286fcf' - 'a3267cfeb115a06ad5dd6e4a74b44778e3e6bbb6' - 'c3903dc78dd0c233075fb33077d1e134b9d148d8' - '72cfecbe738085eec475e012617661ad0cc9b76f' - 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f') -validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') +sha256sums=('c22244bc766b2d8152f22db7370965431dcb1e408260428208c24984f78e6659' + 'SKIP' + 'e4ebf0a4ca0b59cfe71976dfd0e2713a3e2de1f87d5f9666dd1d3246556d184f' + 'SKIP' + '38a0cf3c47725213877b7620ce4153ab35c1e03345093469e85d7a7c2b3e94de' + 'SKIP' + 'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1' + 'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7' + '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f' + '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e' + 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467') +validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <w...@gnu.org> prepare() { # Rename source dir to allow building the demos - mv freetype-${pkgver} freetype2 - mv ft2demos-${pkgver} freetype2-demos + mv freetype-$pkgver freetype2 + mv ft2demos-$pkgver freetype2-demos cd freetype2 patch -Np1 -i ../0001-Enable-table-validation-modules.patch - patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch - patch -Np1 -i ../0003-Enable-long-PCF-family-names.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 cd ../freetype2-demos - # enable more demos - patch -Np1 -i ../freetype-2.5.2-more-demos.patch # Suppress RPATH sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk @@ -67,29 +67,29 @@ } package_freetype2() { - provides=('libfreetype.so') + provides=(libfreetype.so) install=freetype2.install - backup=('etc/profile.d/freetype2.sh') + backup=(etc/profile.d/freetype2.sh) cd freetype2 - make DESTDIR="${pkgdir}" install - install -Dt "${pkgdir}/etc/profile.d" -m644 ../freetype2.sh + make DESTDIR="$pkgdir" install + install -Dt "$pkgdir/etc/profile.d" -m644 ../freetype2.sh } package_freetype2-demos() { pkgdesc="Freetype tools and demos" - depends=('freetype2' 'libx11') + depends=(freetype2 libx11) cd freetype2-demos - install -d "${pkgdir}/usr/bin" + install -d "$pkgdir/usr/bin" for _i in bin/{f,t}t*; do - libtool --mode=install install $_i "${pkgdir}/usr/bin" + libtool --mode=install install $_i "$pkgdir/usr/bin" done } package_freetype2-docs() { pkgdesc="Freetype documentation" - depends=('freetype2') + depends=(freetype2) cd freetype2 install -d "${pkgdir}/usr/share/doc" Deleted: freetype-2.5.2-more-demos.patch =================================================================== --- freetype-2.5.2-more-demos.patch 2020-10-10 19:47:52 UTC (rev 397934) +++ freetype-2.5.2-more-demos.patch 2020-10-10 20:20:36 UTC (rev 397935) @@ -1,17 +0,0 @@ ---- ft2demos-2.5.2/Makefile -+++ ft2demos-2.5.2/Makefile -@@ -296,10 +296,10 @@ else - # The following programs are not compiled automatically; either comment - # out the affected line or use the program name as a Makefile target. - # -- # EXES += ftchkwd -- # EXES += ftmemchk -- # EXES += ftpatchk -- # EXES += fttimer -+ EXES += ftchkwd -+ EXES += ftmemchk -+ EXES += ftpatchk -+ EXES += fttimer - # EXES += testname - - exes: $(EXES:%=$(BIN_DIR_2)/%$E)