diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-08 03:36:18 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-08 03:36:18 +0000 |
| commit | e3d67b3b2c7235fa6db9787b951bbdfcf568d8bc (patch) | |
| tree | e19b439a4c0d63b14de6dfe298cb574ab44a0c87 /extra/libxft | |
| parent | 6b55be9272c15e1858a1a7236482298f677c1a3b (diff) | |
Sun Jun 8 03:32:09 UTC 2014
Diffstat (limited to 'extra/libxft')
| -rw-r--r-- | extra/libxft/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/libxft/freetype_header.patch | 30 |
2 files changed, 6 insertions, 39 deletions
diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD index 6bec9aa3d..4b285bfd8 100644 --- a/extra/libxft/PKGBUILD +++ b/extra/libxft/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 202705 2013-12-25 17:35:47Z andyrtr $ +# $Id: PKGBUILD 214335 2014-06-06 21:45:06Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.2 +pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') -source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2" - freetype_header.patch) -sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd' - '991c91998e61e83061c6c08218a2e6ac5643f16183750f73ee74f29fdd440be9') +source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) +sha256sums=('f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c') build() { cd "${srcdir}/libXft-${pkgver}" - # fix build for freetype header moved - http://cgit.freedesktop.org/xorg/lib/libXft/patch/?id=4acfdaf95adb0a05c2a25550bdde036c865902f4 - patch -Np1 -i ${srcdir}/freetype_header.patch ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/libxft/freetype_header.patch b/extra/libxft/freetype_header.patch deleted file mode 100644 index 9aba8ee29..000000000 --- a/extra/libxft/freetype_header.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Mon, 02 Dec 2013 15:26:24 +0000 -Subject: Use FT_*_H macros instead of including <freetype/*.h> - -freetype moved its headers around in 2.5.1. - -Signed-off-by: Julien Cristau <jcristau@debian.org> ---- -diff --git a/src/xftglyphs.c b/src/xftglyphs.c -index 2f3dc5a..4b5fb82 100644 ---- a/src/xftglyphs.c -+++ b/src/xftglyphs.c -@@ -21,10 +21,10 @@ - */ - - #include "xftint.h" --#include <freetype/ftoutln.h> --#include <freetype/ftlcdfil.h> -+#include FT_OUTLINE_H -+#include FT_LCD_FILTER_H - --#include <freetype/ftsynth.h> -+#include FT_SYNTHESIS_H - - /* - * Validate the memory info for a font --- -cgit v0.9.0.2-2-gbebe - |