[arch-commits] Commit in libxft/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Jun 2 21:27:53 UTC 2012
Date: Saturday, June 2, 2012 @ 17:27:53
Author: andyrtr
Revision: 160629
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libxft/repos/extra-i686/PKGBUILD
(from rev 160628, libxft/trunk/PKGBUILD)
libxft/repos/extra-x86_64/PKGBUILD
(from rev 160628, libxft/trunk/PKGBUILD)
Deleted:
libxft/repos/extra-i686/PKGBUILD
libxft/repos/extra-i686/git_fixes.diff
libxft/repos/extra-x86_64/PKGBUILD
libxft/repos/extra-x86_64/git_fixes.diff
-----------------------------+
extra-i686/PKGBUILD | 62 +++++++++++++++++++-----------------------
extra-i686/git_fixes.diff | 43 -----------------------------
extra-x86_64/PKGBUILD | 62 +++++++++++++++++++-----------------------
extra-x86_64/git_fixes.diff | 43 -----------------------------
4 files changed, 58 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-06-02 21:27:12 UTC (rev 160628)
+++ extra-i686/PKGBUILD 2012-06-02 21:27:53 UTC (rev 160629)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libxft
-pkgver=2.3.0
-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')
-options=('!libtool')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
- git_fixes.diff)
-sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23'
- 'a87a56f62905bfcd85469caf349d07f37f84a989')
-
-build() {
- cd "${srcdir}/libXft-${pkgver}"
- # fix broken bold fonts in urxvt terinals - https://bugs.freedesktop.org/show_bug.cgi?id=47178 + https://bugs.freedesktop.org/show_bug.cgi?id=47196
- patch -Np1 -i ${srcdir}/git_fixes.diff
- ./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 160628, libxft/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-06-02 21:27:53 UTC (rev 160629)
@@ -0,0 +1,29 @@
+# $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')
+options=('!libtool')
+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}/"
+
+}
Deleted: extra-i686/git_fixes.diff
===================================================================
--- extra-i686/git_fixes.diff 2012-06-02 21:27:12 UTC (rev 160628)
+++ extra-i686/git_fixes.diff 2012-06-02 21:27:53 UTC (rev 160629)
@@ -1,43 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu at gmail.com>
-Date: Sun, 11 Mar 2012 01:41:55 +0000
-Subject: Fixup for 550b2f76401c2 which broke bold fonts
-
-The commit removed the line
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
-but failed to remove the #if lines that this commit removes, resulting
-in that code never being executed.
-
-Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
-
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 4a3b9d6..2f3dc5a 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -24,9 +24,7 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ftlcdfil.h>
-
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- #include <freetype/ftsynth.h>
--#endif
-
- /*
- * Validate the memory info for a font
-@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display *dpy,
-
- glyphslot = face->glyph;
-
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- /*
- * Embolden if required
- */
- if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
--#endif
-
- /*
- * Compute glyph metrics from FreeType information
---
-cgit v0.9.0.2-2-gbebe
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-06-02 21:27:12 UTC (rev 160628)
+++ extra-x86_64/PKGBUILD 2012-06-02 21:27:53 UTC (rev 160629)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libxft
-pkgver=2.3.0
-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')
-options=('!libtool')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
- git_fixes.diff)
-sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23'
- 'a87a56f62905bfcd85469caf349d07f37f84a989')
-
-build() {
- cd "${srcdir}/libXft-${pkgver}"
- # fix broken bold fonts in urxvt terinals - https://bugs.freedesktop.org/show_bug.cgi?id=47178 + https://bugs.freedesktop.org/show_bug.cgi?id=47196
- patch -Np1 -i ${srcdir}/git_fixes.diff
- ./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 160628, libxft/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-06-02 21:27:53 UTC (rev 160629)
@@ -0,0 +1,29 @@
+# $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')
+options=('!libtool')
+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}/"
+
+}
Deleted: extra-x86_64/git_fixes.diff
===================================================================
--- extra-x86_64/git_fixes.diff 2012-06-02 21:27:12 UTC (rev 160628)
+++ extra-x86_64/git_fixes.diff 2012-06-02 21:27:53 UTC (rev 160629)
@@ -1,43 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu at gmail.com>
-Date: Sun, 11 Mar 2012 01:41:55 +0000
-Subject: Fixup for 550b2f76401c2 which broke bold fonts
-
-The commit removed the line
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
-but failed to remove the #if lines that this commit removes, resulting
-in that code never being executed.
-
-Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
-
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 4a3b9d6..2f3dc5a 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -24,9 +24,7 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ftlcdfil.h>
-
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- #include <freetype/ftsynth.h>
--#endif
-
- /*
- * Validate the memory info for a font
-@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display *dpy,
-
- glyphslot = face->glyph;
-
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- /*
- * Embolden if required
- */
- if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
--#endif
-
- /*
- * Compute glyph metrics from FreeType information
---
-cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list