[arch-commits] Commit in libxft/repos (6 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Wed Dec 25 17:35:47 UTC 2013
Date: Wednesday, December 25, 2013 @ 18:35:47
Author: andyrtr
Revision: 202705
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libxft/repos/extra-i686/PKGBUILD
(from rev 202704, libxft/trunk/PKGBUILD)
libxft/repos/extra-i686/freetype_header.patch
(from rev 202704, libxft/trunk/freetype_header.patch)
libxft/repos/extra-x86_64/PKGBUILD
(from rev 202704, libxft/trunk/PKGBUILD)
libxft/repos/extra-x86_64/freetype_header.patch
(from rev 202704, libxft/trunk/freetype_header.patch)
Deleted:
libxft/repos/extra-i686/PKGBUILD
libxft/repos/extra-x86_64/PKGBUILD
------------------------------------+
/PKGBUILD | 64 +++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 28 ---------------
extra-i686/freetype_header.patch | 30 ++++++++++++++++
extra-x86_64/PKGBUILD | 28 ---------------
extra-x86_64/freetype_header.patch | 30 ++++++++++++++++
5 files changed, 124 insertions(+), 56 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-12-25 17:35:31 UTC (rev 202704)
+++ extra-i686/PKGBUILD 2013-12-25 17:35:47 UTC (rev 202705)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libxft
-pkgver=2.3.1
-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")
-sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd')
-
-build() {
- cd "${srcdir}/libXft-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/libXft-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-}
Copied: libxft/repos/extra-i686/PKGBUILD (from rev 202704, libxft/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-12-25 17:35:47 UTC (rev 202705)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libxft
+pkgver=2.3.1
+pkgrel=2
+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')
+
+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
+}
+
+package() {
+ cd "${srcdir}/libXft-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+}
Copied: libxft/repos/extra-i686/freetype_header.patch (from rev 202704, libxft/trunk/freetype_header.patch)
===================================================================
--- extra-i686/freetype_header.patch (rev 0)
+++ extra-i686/freetype_header.patch 2013-12-25 17:35:47 UTC (rev 202705)
@@ -0,0 +1,30 @@
+From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau at 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 at 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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-12-25 17:35:31 UTC (rev 202704)
+++ extra-x86_64/PKGBUILD 2013-12-25 17:35:47 UTC (rev 202705)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libxft
-pkgver=2.3.1
-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")
-sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd')
-
-build() {
- cd "${srcdir}/libXft-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/libXft-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-}
Copied: libxft/repos/extra-x86_64/PKGBUILD (from rev 202704, libxft/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-12-25 17:35:47 UTC (rev 202705)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libxft
+pkgver=2.3.1
+pkgrel=2
+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')
+
+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
+}
+
+package() {
+ cd "${srcdir}/libXft-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+}
Copied: libxft/repos/extra-x86_64/freetype_header.patch (from rev 202704, libxft/trunk/freetype_header.patch)
===================================================================
--- extra-x86_64/freetype_header.patch (rev 0)
+++ extra-x86_64/freetype_header.patch 2013-12-25 17:35:47 UTC (rev 202705)
@@ -0,0 +1,30 @@
+From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau at 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 at 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
+
More information about the arch-commits
mailing list