libXft: update to 2.3.1.

This commit is contained in:
Juan RP 2014-01-20 11:33:35 +01:00
parent d3d04006bf
commit a696de1431
2 changed files with 36 additions and 16 deletions

View File

@ -0,0 +1,30 @@
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
--- src/xftglyphs.c
+++ 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

View File

@ -1,7 +1,7 @@
# Template build file for 'libXft'. # Template build file for 'libXft'.
pkgname=libXft pkgname=libXft
version=2.3.0 version=2.3.1
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xproto libXrender-devel freetype-devel fontconfig-devel" makedepends="xproto libXrender-devel freetype-devel fontconfig-devel"
@ -10,25 +10,15 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT" license="MIT"
homepage="${XORG_SITE}" homepage="${XORG_SITE}"
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
checksum=3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044 checksum=7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd
long_desc="
Xft (2.0) provides a client-side font API for X applications. It uses
Fontconfig to select fonts and the X protocol for rendering them. When
available, Xft uses the Render extension to accelerate text drawing.
When Render is not available, Xft uses the core protocol to draw
client-side glyphs. This provides completely compatible support of
client-side fonts for all X servers.
Xft (2.0) hides most of the underlying system details so that developers
can confidently use its API to access client-side fonts in any X
environment."
libXft-devel_package() { libXft-devel_package() {
depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft>=${version}" depends="xproto libXrender-devel fontconfig-devel freetype-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove "usr/lib/lib*.a" vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove usr/share vmove usr/share
} }