mingw-w64-freetype - Upgrade to 2.7

Upgrade to 2.7
drop mingw-config.patch for now.  I found that it was causing warnings
about duplicate definitions.
This commit is contained in:
J. Peter Mugaas
2016-09-19 02:10:47 -04:00
parent 0e7410fefd
commit 5fc32722ec
2 changed files with 29 additions and 10 deletions

View File

@@ -4,7 +4,7 @@
_realname=freetype
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.6.5
pkgver=2.7
pkgrel=1
pkgdesc="TrueType font rendering library (mingw-w64)"
arch=('any')
@@ -18,21 +18,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
options=('strip' '!libtool' 'staticlibs')
source=(https://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
freetype-2.2.1-enable-valid.patch
freetype-2.7-enable-valid.patch
freetype-2.5.1-enable-spr.patch
freetype-2.5.1-enable-sph.patch
mingw-config.patch)
sha256sums=('e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0'
'54c83a91b0b2ad7edad7df00a2c26a11ca18431a8e323db9471268a139c46f7e'
freetype-2.5.1-enable-sph.patch)
sha256sums=('d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48'
'975d5a6eb1f6041fe5a497d7658f2e1ca2cfe5610dbd2e94ab375ad481b279d1'
'3ee5690d4d7cb48b8862e203d09b530805066cdfda0f51716b8ae2a47eef8b2d'
'324012ad68388d22c63368314721d2360b48dd40daa808d0383699a281d931b0'
'fcfe98e57b6afd449f6d7464c92199998254b5a6becebc20f9eb06f1667138b2')
'324012ad68388d22c63368314721d2360b48dd40daa808d0383699a281d931b0')
prepare() {
cd "${srcdir}/freetype-${pkgver}"
patch -p1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
plain "freetype-2.7-enable-valid.patch"
patch -p1 -i "${srcdir}/freetype-2.7-enable-valid.patch"
plain "freetype-2.5.1-enable-spr.patch"
patch -p1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
patch -p1 -i "${srcdir}/mingw-config.patch"
# Disabled for now due to resistance
# Kept here for easier rebuilds via ABS

View File

@@ -0,0 +1,20 @@
--- freetype-2.7/modules.cfg.orig 2016-09-16 06:16:01.948572000 -0400
+++ freetype-2.7/modules.cfg 2016-09-16 06:22:20.417222400 -0400
@@ -120,7 +120,7 @@
# TrueType GX/AAT table validation. Needs ftgxval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz).
#
@@ -143,7 +143,7 @@
# OpenType table validation. Needs ftotval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
# Auxiliary PostScript driver component to share common code.
#