From 844896e57fa8c313a737086ac8a202999bd60eda Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 18 Feb 2016 14:25:53 +0100 Subject: main/freetype: upgrade to 2.6.3 --- main/freetype/APKBUILD | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD index b283c231ad..b17786d4f5 100644 --- a/main/freetype/APKBUILD +++ b/main/freetype/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=freetype -pkgver=2.6.2 +pkgver=2.6.3 pkgrel=0 pkgdesc="TrueType font rendering library" url="http://freetype.sourceforge.net" arch="all" license="GPL" depends="" -depends_dev="libpng-dev" -makedepends="$depends_dev zlib-dev" +depends_dev="" +makedepends="$depends_dev zlib-dev libpng-dev" subpackages="$pkgname-dev $pkgname-doc" # fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate -_ultver="2015-11-28" +_ultver="2016-02-12" source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2 - fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz + fontconfig-ultimate-$_ultver.tar.gz::https://github.com/renatoaguiar/fontconfig-ultimate/archive/$_ultver.tar.gz 40-memcpy-fix.patch" _builddir="$srcdir/$pkgname-$pkgver" @@ -27,8 +27,15 @@ prepare() { done # apply infinality for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do - msg "Applying ${j}" - patch -p1 -i $j || return 1 + case $j in + */gperf-for-infinality.patch) + msg "Skipping ${j}" + ;; + *) + msg "Applying ${j}" + patch -p1 -i $j || return 1 + ;; + esac done } @@ -61,12 +68,12 @@ package() { "$pkgdir"/etc/X11/xinit/xinitrc.d/infinality-settings.sh || return 1 } -md5sums="86109d0c998787d81ac582bad9adf82e freetype-2.6.2.tar.bz2 -5daf5ab6809d694d521c2763cd932274 fontconfig-ultimate-2015-11-28.tar.gz +md5sums="0037b25a8c090bc8a1218e867b32beb1 freetype-2.6.3.tar.bz2 +d5d9467394b73baf4e830b3f6fc944cd fontconfig-ultimate-2016-02-12.tar.gz bd2d808a0c00dcf9f1d1c0a9a8227ad9 40-memcpy-fix.patch" -sha256sums="baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 freetype-2.6.2.tar.bz2 -04088390737aa4d6ec867903293fe4e50852c5d2d8cec6ec9d5143e54e45a207 fontconfig-ultimate-2015-11-28.tar.gz +sha256sums="371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2 freetype-2.6.3.tar.bz2 +c67e3a8c5cdb19636e936a822df862e59f84b468e3d70d0991b23bb37099d356 fontconfig-ultimate-2016-02-12.tar.gz 574c265c7a7032c5afb32a9807e5d04354ad0def656194cfcfff1ccca6a5540e 40-memcpy-fix.patch" -sha512sums="269d7a2ba728b4cb79d1d533ce93674bfd483566ab80bc6be0ec24f869cb65ba1fd852fbeff8f045607dd044845ce3d125374faeb14c986761b94dce7d1ff48b freetype-2.6.2.tar.bz2 -f08c543ef94ee46f22467d95d4f200f031177b56209de5091a3de7f6c9b2ba33edb961a972f2d8ed6958a181c6b845f1ee2dc0122109a8fa9198585645a5dd15 fontconfig-ultimate-2015-11-28.tar.gz +sha512sums="e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d freetype-2.6.3.tar.bz2 +b6d7a59c4a26b3b99a817e27eead2ca58538770b48af935100262223d5422c835c48590736cedb59ad220be3d7af6a7933e3137da99fdc8603f8fc8d81b8e4b9 fontconfig-ultimate-2016-02-12.tar.gz 1553f7f0514238012e300bc8d0b1e260145db17fb56f13e4aa667435e98c3749c00e150caa0e318289b84bca33b9a06a68b8342575e10ac3bf5af3d5cc861537 40-memcpy-fix.patch" -- cgit v1.2.3