diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-05 03:33:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-05 03:33:25 -0300 |
| commit | fa8be7b03b46e65b64d710cbfae7ba4a93751a57 (patch) | |
| tree | 485f4f134233af2f3d63b9dcf9e97506467a74b9 /extra/freetype2/PKGBUILD | |
| parent | aced7a6b55bc695c39eb6482b254829f0b56ff4b (diff) | |
| parent | a7f79fc1ced18c586d320033ac9738e98a21b550 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/libtool/PKGBUILD
core/wpa_actiond/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc_pure64-multilib.patch
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
multilib/lib32-glibc/glibc-__i686.patch
multilib/libtool-multilib/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdepim-runtime/PKGBUILD
testing/telepathy-gabble/PKGBUILD
testing/telepathy-glib/PKGBUILD
testing/telepathy-mission-control/PKGBUILD
Diffstat (limited to 'extra/freetype2/PKGBUILD')
| -rw-r--r-- | extra/freetype2/PKGBUILD | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index ea450c697..968a88b66 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153269 2012-03-12 19:00:15Z jgc $ +# $Id: PKGBUILD 155391 2012-04-03 10:23:46Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 pkgver=2.4.9 -pkgrel=1 +pkgrel=2 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -12,16 +12,24 @@ 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) + freetype-2.2.1-enable-valid.patch + bug35833.patch + bug35847.patch) md5sums=('77a893dae81fd5b896632715ca041179' '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') + '214119610444c9b02766ccee5e220680' + '69bde731a06448c7e4828e96c74d45ee' + '41f9c0a5362bf2cd9a4d7557ddf98098') 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 } |