diff options
| -rw-r--r-- | user/freetype/APKBUILD | 28 | ||||
| -rw-r--r-- | user/openjdk8/APKBUILD | 2 |
2 files changed, 6 insertions, 24 deletions
diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index 652bef747..b2f5cd66e 100644 --- a/user/freetype/APKBUILD +++ b/user/freetype/APKBUILD @@ -1,25 +1,17 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetype -pkgver=2.9.1 -pkgrel=2 +pkgver=2.10.0 +pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" arch="all" license="FTL OR GPL-2.0+" options="!check" depends="" -depends_dev="" -makedepends="$depends_dev zlib-dev libpng-dev bzip2-dev" +makedepends="zlib-dev libpng-dev bzip2-dev" subpackages="$pkgname-dev $pkgname-doc" -source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2 - 40-memcpy-fix.patch - 0001-Enable-table-validation-modules.patch - 0003-Enable-infinality-subpixel-hinting.patch - 0004-Enable-long-PCF-family-names.patch - - freetype-profile.sh - " +source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2" # secfixes: # 2.9.1-r0: @@ -29,7 +21,6 @@ source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar. # - CVE-2017-8287 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -43,11 +34,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir"/freetype-profile.sh \ - "$pkgdir"/etc/profile.d/freetype.sh } doc() { @@ -55,9 +42,4 @@ doc() { default_doc } -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 -64c20fbcbf48372ea35fe2e0dae8fec4be8c601c899a4a71913060c6ea4082a2f41d69701da511e09fee126bf198d560986469e2356bd088d2dd5961f437df63 0004-Enable-long-PCF-family-names.patch -7100cde5b2ca16bfbe968fce3e2eba5ba49e6ed53792d5db889c8d89e572d7d80da1338ccc9eeb9b243664ca2337467e9f73c1074bee0b34c417f6c7832ed390 freetype-profile.sh" +sha512sums="dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e freetype-2.10.0.tar.bz2" diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 2ed565def..24dd5e28a 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -170,7 +170,7 @@ build() { --with-nashorn-src-zip="$srcdir/nashorn-$_dropsver.tar.xz" \ --with-pax=paxmark \ --with-jdk-home="$_bootstrap_java_home" \ - --with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \ + --with-pkgversion="Adelie ${pkgver}-r${pkgrel}" \ --enable-nss \ --enable-non-nss-curves make |