commit libXft for openSUSE:Factory

Hello community, here is the log from the commit of package libXft for openSUSE:Factory checked in at 2012-05-08 11:57:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXft (Old) and /work/SRC/openSUSE:Factory/.libXft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXft", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libXft/libXft.changes 2012-02-17 12:03:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libXft.new/libXft.changes 2012-05-08 11:58:14.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 12 06:44:16 UTC 2012 - vuntz@opensuse.org + +- Update to version 2.3.0: + + Subpixel LCD text rendering improvements + + Fix two crasher bugs + + Fix compiler warnings + + Code cleanups + + Build system improvements +- Add pkgconfig(x11) BuildRequires: new explicit dependency + upstream. +- Add libXft-fix-bold-fonts.patch: fix regression that broke bold + fonts, taken from git. +- Drop libXft-2.1.7-lcd-filter-2.patch: integrated upstream. + +------------------------------------------------------------------- Old: ---- libXft-2.1.7-lcd-filter-2.patch libXft-2.2.0.tar.bz2 New: ---- libXft-2.3.0.tar.bz2 libXft-fix-bold-fonts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXft.spec ++++++ --- /var/tmp/diff_new_pack.JKuQSa/_old 2012-05-08 11:58:15.000000000 +0200 +++ /var/tmp/diff_new_pack.JKuQSa/_new 2012-05-08 11:58:15.000000000 +0200 @@ -14,24 +14,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libXft %define lname libXft2 -Version: 2.2.0 +Version: 2.3.0 Release: 0 Summary: X FreeType library License: MIT Group: Development/Libraries/C and C++ -URL: http://xorg.freedesktop.org/ +Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXft #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXft/ -Source: %name-%version.tar.bz2 -Patch1: libXft-2.1.7-lcd-filter-2.patch -BuildRoot: %_tmppath/%name-%version-build +Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libXft-fix-bold-fonts.patch vuntz@opensuse.org -- Taken from git, fix regression that broke bold fonts +Patch1: libXft-fix-bold-fonts.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool -BuildRequires: pkgconfig, pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xrender) >= 0.8.2, pkgconfig(freetype2) -BuildRequires: pkgconfig(fontconfig) >= 2.2 +BuildRequires: pkgconfig +BuildRequires: pkgconfig(fontconfig) >= 2.5.92 +BuildRequires: pkgconfig(freetype2) >= 2.1.6 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xrender) >= 0.8.2 %description Xft is a library that connects X applications with the FreeType font @@ -62,7 +68,7 @@ %prep %setup -q -%patch -P 1 -p0 +%patch -P 1 -p1 %build %configure --disable-static ++++++ libXft-2.2.0.tar.bz2 -> libXft-2.3.0.tar.bz2 ++++++ ++++ 46606 lines of diff (skipped) ++++++ libXft-fix-bold-fonts.patch ++++++

From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001 From: Mikael Magnusson 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 --- 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 #include -#if HAVE_FT_GLYPHSLOT_EMBOLDEN #include -#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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org