diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /extra/libxft | |
parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'extra/libxft')
-rw-r--r-- | extra/libxft/git_fixes.diff | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/extra/libxft/git_fixes.diff b/extra/libxft/git_fixes.diff deleted file mode 100644 index 3a7155271..000000000 --- a/extra/libxft/git_fixes.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001 -From: Mikael Magnusson <mikachu@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@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 |