summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/freetype/0001-Enable-table-validation-modules.patch (renamed from user/freetype/0001-Enable-table-validation-modules.patch)0
-rw-r--r--system/freetype/0002-Enable-subpixel-rendering.patch (renamed from user/freetype/0002-Enable-subpixel-rendering.patch)0
-rw-r--r--system/freetype/0003-Enable-infinality-subpixel-hinting.patch (renamed from user/freetype/0003-Enable-infinality-subpixel-hinting.patch)0
-rw-r--r--system/freetype/0004-Enable-long-PCF-family-names.patch (renamed from user/freetype/0004-Enable-long-PCF-family-names.patch)0
-rw-r--r--system/freetype/40-memcpy-fix.patch (renamed from user/freetype/40-memcpy-fix.patch)0
-rw-r--r--system/freetype/APKBUILD (renamed from user/freetype/APKBUILD)16
-rw-r--r--system/freetype/freetype-profile.sh (renamed from user/freetype/freetype-profile.sh)0
7 files changed, 7 insertions, 9 deletions
diff --git a/user/freetype/0001-Enable-table-validation-modules.patch b/system/freetype/0001-Enable-table-validation-modules.patch
index 3e9451fa8..3e9451fa8 100644
--- a/user/freetype/0001-Enable-table-validation-modules.patch
+++ b/system/freetype/0001-Enable-table-validation-modules.patch
diff --git a/user/freetype/0002-Enable-subpixel-rendering.patch b/system/freetype/0002-Enable-subpixel-rendering.patch
index dfb57966e..dfb57966e 100644
--- a/user/freetype/0002-Enable-subpixel-rendering.patch
+++ b/system/freetype/0002-Enable-subpixel-rendering.patch
diff --git a/user/freetype/0003-Enable-infinality-subpixel-hinting.patch b/system/freetype/0003-Enable-infinality-subpixel-hinting.patch
index bbfa2a2cd..bbfa2a2cd 100644
--- a/user/freetype/0003-Enable-infinality-subpixel-hinting.patch
+++ b/system/freetype/0003-Enable-infinality-subpixel-hinting.patch
diff --git a/user/freetype/0004-Enable-long-PCF-family-names.patch b/system/freetype/0004-Enable-long-PCF-family-names.patch
index 675423a7c..675423a7c 100644
--- a/user/freetype/0004-Enable-long-PCF-family-names.patch
+++ b/system/freetype/0004-Enable-long-PCF-family-names.patch
diff --git a/user/freetype/40-memcpy-fix.patch b/system/freetype/40-memcpy-fix.patch
index 89e61cd0b..89e61cd0b 100644
--- a/user/freetype/40-memcpy-fix.patch
+++ b/system/freetype/40-memcpy-fix.patch
diff --git a/user/freetype/APKBUILD b/system/freetype/APKBUILD
index fbb4e0103..37ab71932 100644
--- a/user/freetype/APKBUILD
+++ b/system/freetype/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=freetype
-pkgver=2.8.1
-pkgrel=2
+pkgver=2.9.1
+pkgrel=0
pkgdesc="TrueType font rendering library"
url="https://www.freetype.org/"
arch="all"
@@ -11,7 +11,7 @@ options="!check"
depends=""
depends_dev=""
makedepends="$depends_dev zlib-dev libpng-dev bzip2-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev"
source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2
40-memcpy-fix.patch
0001-Enable-table-validation-modules.patch
@@ -22,12 +22,12 @@ source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.
"
# secfixes:
+# 2.9.1-r0:
+# - CVE-2018-6942
# 2.7.1-r1:
# - CVE-2017-8105
# - CVE-2017-8287
-builddir="$srcdir/$pkgname-$pkgver"
-
build() {
cd "$builddir"
./configure \
@@ -35,8 +35,6 @@ build() {
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
--disable-static \
--with-bzip2 \
--with-png
@@ -51,7 +49,7 @@ package() {
"$pkgdir"/etc/profile.d/freetype.sh
}
-sha512sums="ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823 freetype-2.8.1.tar.bz2
+sha512sums="856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 freetype-2.9.1.tar.bz2
9981be8a3ea6f2cf856860b87a4e895e4610c9d5ea4beb611815e757e6080e060f6853ace02dd8ea55e5888cdf4bae5ad5eadd2d8a123754bb3c0bfe7ef41dea 40-memcpy-fix.patch
41a84be2631b53072a76b78c582575aa48b650ee7b00017d018381002bc25df10cf33da4954c95ef50db39f1fa566678e3b4ae9bfee1dfd705423fb53e53e494 0001-Enable-table-validation-modules.patch
7b52a3d67750d59b2c98e83dab4e0a0ab263142c2ca7bd5f8be5f8fe9cd1dc1f4debad44111c7886665329d8d2a3163756455618a6615df8f85d82bb0372d4dd 0003-Enable-infinality-subpixel-hinting.patch
diff --git a/user/freetype/freetype-profile.sh b/system/freetype/freetype-profile.sh
index a4cc6423b..a4cc6423b 100644
--- a/user/freetype/freetype-profile.sh
+++ b/system/freetype/freetype-profile.sh