Hello community, here is the log from the commit of package xfs for openSUSE:Factory checked in at 2014-07-16 16:19:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfs (Old) and /work/SRC/openSUSE:Factory/.xfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfs" Changes: -------- --- /work/SRC/openSUSE:Factory/xfs/xfs.changes 2014-03-22 19:46:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfs.new/xfs.changes 2014-07-16 16:22:12.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 15 13:18:29 UTC 2014 - [email protected] + +- U_Only-call-SnfSetFormat-if-libXfont-is-built-with-SNF.patch + * needed after switching to libXfont 1.8, which now disables + support for SNF font format by default + +------------------------------------------------------------------- New: ---- U_Only-call-SnfSetFormat-if-libXfont-is-built-with-SNF.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfs.spec ++++++ --- /var/tmp/diff_new_pack.ANEik0/_old 2014-07-16 16:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.ANEik0/_new 2014-07-16 16:22:13.000000000 +0200 @@ -28,6 +28,7 @@ Source0: %{name}-%{version}-2c79452.tar.bz2 Source1: xfs.config Source2: xfs.init.d +Patch0: U_Only-call-SnfSetFormat-if-libXfont-is-built-with-SNF.patch %if 0%{?suse_version} >= 01140 # Needed to create the man page symlink to init.d BuildRequires: aaa_base-extras @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ U_Only-call-SnfSetFormat-if-libXfont-is-built-with-SNF.patch ++++++ >From 659e9deafa76bb7feab16afc848392536361c92b Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <[email protected]> Date: Fri, 16 May 2014 15:33:56 -0700 Subject: [PATCH] Only call SnfSetFormat if libXfont is built with SNF support Signed-off-by: Alan Coopersmith <[email protected]> --- os/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/os/config.c b/os/config.c index 2e5dc1c..81275ea 100644 --- a/os/config.c +++ b/os/config.c @@ -60,6 +60,7 @@ in this Software without prior written authorization from The Open Group. #include "difsutils.h" #include <X11/fonts/fontutil.h> #include "difs.h" +#include <X11/fonts/fontconf.h> /* libXfont/src/bitmap/snfstr.h */ extern void SnfSetFormat(int bit, int byte, int glyph, int scan); @@ -660,6 +661,8 @@ config_set_snf_format ( val = config_parse_int (parm, val, &ret, &scan); if (ret == -1) return val; +#ifdef XFONT_SNFFORMAT SnfSetFormat (bit, byte, glyph, scan); +#endif return val; } -- 1.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
