diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 09:36:19 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 09:36:19 +0200 |
commit | cb08e4a8bd52e55b2d425484b9fd2fe357f663c3 (patch) | |
tree | 03aa7b8ad93cd8815a1c1be95b563a667d92d6b8 /extra/freetype2 | |
parent | fb62b6371fdc9ffe50d30c698f13ea1fb39c215b (diff) | |
parent | 61f450a3578b7e51c337e1a687c0cef2bc07ff35 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/lirc/PKGBUILD
extra/php/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/clamav/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'extra/freetype2')
-rw-r--r-- | extra/freetype2/PKGBUILD | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index 968a88b66..3bd67cbf0 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155391 2012-04-03 10:23:46Z jgc $ +# $Id: PKGBUILD 161854 2012-06-15 16:53:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.9 -pkgrel=2 +pkgver=2.4.10 +pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -12,24 +12,16 @@ depends=('zlib' 'bzip2' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch - bug35833.patch - bug35847.patch) -md5sums=('77a893dae81fd5b896632715ca041179' + freetype-2.2.1-enable-valid.patch) +md5sums=('13286702e9390a91661f980608adaff1' '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680' - '69bde731a06448c7e4828e96c74d45ee' - '41f9c0a5362bf2cd9a4d7557ddf98098') + '214119610444c9b02766ccee5e220680') build() { cd "${srcdir}/freetype-${pkgver}" patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - #Upstream bugs fixed in git. Requested in FS#29034 - patch -Np1 -i "${srcdir}/bug35833.patch" - patch -Np1 -i "${srcdir}/bug35847.patch" - ./configure --prefix=/usr make } |