diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | 0001-Enable-table-validation-modules.patch | 12 | ||||
| -rw-r--r-- | 0002-Enable-infinality-subpixel-hinting.patch | 30 | ||||
| -rw-r--r-- | 0002-Enable-subpixel-rendering.patch | 22 | ||||
| -rw-r--r-- | 0003-Enable-long-PCF-family-names.patch | 14 | ||||
| -rw-r--r-- | PKGBUILD | 52 |
6 files changed, 69 insertions, 89 deletions
@@ -1,37 +1,33 @@ pkgbase = mingw-w64-freetype2 pkgdesc = Font rasterization library (mingw-w64) - pkgver = 2.10.0 + pkgver = 2.13.2 pkgrel = 1 url = https://www.freetype.org/ arch = any license = GPL makedepends = mingw-w64-gcc - makedepends = mingw-w64-configure + makedepends = mingw-w64-meson depends = mingw-w64-crt depends = mingw-w64-zlib depends = mingw-w64-bzip2 + depends = mingw-w64-brotli depends = mingw-w64-harfbuzz - provides = mingw-w64-freetype provides = mingw-w64-freetype2-bootstrap - conflicts = mingw-w64-freetype conflicts = mingw-w64-freetype2-bootstrap - replaces = mingw-w64-freetype - replaces = mingw-w64-freetype2-bootstrap options = !strip options = !buildflags options = !libtool options = staticlibs - source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2 - source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2.sig + source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz + source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz.sig source = 0001-Enable-table-validation-modules.patch - source = 0002-Enable-infinality-subpixel-hinting.patch + source = 0002-Enable-subpixel-rendering.patch source = 0003-Enable-long-PCF-family-names.patch - validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5 - sha1sums = f6abf03e0e3189a0de883981c57d3861b5d314f5 - sha1sums = SKIP - sha1sums = 46fd67e6a594f6c2c473b9321ba64913984ba42f - sha1sums = 4bf0c0749db09878b918cc404300f0d3e9091607 - sha1sums = af76172be8135e74391b7ad1b82c2124ae0ad86c + validpgpkeys = E30674707856409FF1948010BE6C3AAC63AD8E3F + b2sums = cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e + b2sums = SKIP + b2sums = 2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1 + b2sums = 9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115 + b2sums = 66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c pkgname = mingw-w64-freetype2 - diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch index 2c38e8f5b665..f360a143132c 100644 --- a/0001-Enable-table-validation-modules.patch +++ b/0001-Enable-table-validation-modules.patch @@ -1,18 +1,17 @@ -From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001 -Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Tue, 23 Jun 2015 08:40:29 +0200 -Subject: [PATCH 1/4] Enable table validation modules +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 dc6c8d42d..2ab145016 100644 +index 5b6c9b5a5c1d..b4933bea7654 100644 --- a/modules.cfg +++ b/modules.cfg -@@ -111,26 +111,26 @@ AUX_MODULES += cache +@@ -117,26 +117,26 @@ AUX_MODULES += cache # TrueType GX/AAT table validation. Needs `ftgxval.c' below. # @@ -41,6 +40,3 @@ index dc6c8d42d..2ab145016 100644 # Auxiliary PostScript driver component to share common code. # --- -2.21.0 - diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch deleted file mode 100644 index 22a19a6463ee..000000000000 --- a/0002-Enable-infinality-subpixel-hinting.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001 -Message-Id: <fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2.1552648361.git.jan.steffens@gmail.com> -In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com> -References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Mon, 29 Aug 2016 08:43:10 +0200 -Subject: [PATCH 2/4] 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 12f47a82e..1d4469a99 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -658,8 +658,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.21.0 - diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch new file mode 100644 index 000000000000..95f40a306efa --- /dev/null +++ b/0002-Enable-subpixel-rendering.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@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 1976b33af959..b3425e55feec 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 + + + /************************************************************************** diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch index 916fe9cf141f..e38679e4184d 100644 --- a/0003-Enable-long-PCF-family-names.patch +++ b/0003-Enable-long-PCF-family-names.patch @@ -1,20 +1,17 @@ -From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001 -Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com> -In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com> -References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Sun, 14 May 2017 18:09:31 +0200 -Subject: [PATCH 3/4] Enable long PCF family names +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 1d4469a99..4ff4e7821 100644 +index b3425e55feec..ecff3ccd12d6 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -847,7 +847,7 @@ FT_BEGIN_HEADER +@@ -887,7 +887,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. */ @@ -23,6 +20,3 @@ index 1d4469a99..4ff4e7821 100644 /*************************************************************************/ --- -2.21.0 - @@ -4,37 +4,37 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2 -pkgver=2.10.0 +pkgver=2.13.2 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') url='https://www.freetype.org/' license=('GPL') -depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2) -makedepends=(mingw-w64-gcc mingw-w64-configure) -provides=(mingw-w64-freetype) -replaces=(mingw-w64-freetype) -conflicts=(mingw-w64-freetype) -source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} - 0001-Enable-table-validation-modules.patch - 0002-Enable-infinality-subpixel-hinting.patch - 0003-Enable-long-PCF-family-names.patch) +depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2 mingw-w64-brotli) +makedepends=(mingw-w64-gcc mingw-w64-meson) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5' - 'SKIP' - '46fd67e6a594f6c2c473b9321ba64913984ba42f' - '4bf0c0749db09878b918cc404300f0d3e9091607' - 'af76172be8135e74391b7ad1b82c2124ae0ad86c') -validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') +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-long-PCF-family-names.patch +) +b2sums=('cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e' + 'SKIP' + '2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1' + '9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115' + '66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c') +validpgpkeys=( + E30674707856409FF1948010BE6C3AAC63AD8E3F # Werner Lemberg <wl@gnu.org> +) if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then - _provides=${pkgname%-bootstrap} + _provides=(${pkgname%-bootstrap}) else - _provides=${pkgname}-bootstrap + _provides=(${pkgname}-bootstrap) # adding harfbuzz for improved OpenType features auto-hinting # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream depends+=(mingw-w64-harfbuzz) - replaces+=(${_provides}) fi provides+=(${_provides}) conflicts+=(${_provides}) @@ -42,28 +42,30 @@ conflicts+=(${_provides}) _architectures='i686-w64-mingw32 x86_64-w64-mingw32' prepare() { - cd "${srcdir}/freetype-${pkgver}" - + cd freetype-$pkgver patch -Np1 -i ../0001-Enable-table-validation-modules.patch - patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch } build() { + local harfbuzz_support=enabled + [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]] && harfbuzz_support=disabled for _arch in ${_architectures}; do mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}" cd "${srcdir}/freetype-${pkgver}/build-${_arch}" - ${_arch}-configure --with-zlib=/usr/${_arch} --without-png - make + ${_arch}-meson --default-library both -D zlib=enabled -D bzip2=enabled -D png=disabled -D harfbuzz="$harfbuzz_support" -D brotli=enabled -D b_lto=false + ninja done } package() { for _arch in ${_architectures}; do cd "${srcdir}/freetype-${pkgver}/build-${_arch}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install rm -rf "${pkgdir}/usr/${_arch}/share/" ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll + ${_arch}-ranlib "${pkgdir}/usr/${_arch}/lib/"*.a done } |