Hello community, here is the log from the commit of package fontconfig for openSUSE:Factory checked in at 2017-03-09 01:30:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontconfig (Old) and /work/SRC/openSUSE:Factory/.fontconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontconfig" Thu Mar 9 01:30:49 2017 rev:84 rq:460495 version:2.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fontconfig/fontconfig.changes 2016-08-17 12:03:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontconfig.new/fontconfig.changes 2017-03-09 01:30:50.647809348 +0100 @@ -1,0 +2,6 @@ +Sun Feb 26 01:44:16 UTC 2017 - qantas94he...@gmail.com + +- Add patch fontconfig-glibc-2.25.patch + * Fixes build with glibc 2.25. + +------------------------------------------------------------------- New: ---- fontconfig-glibc-2.25.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.LQbeEP/_old 2017-03-09 01:30:52.035612793 +0100 +++ /var/tmp/diff_new_pack.LQbeEP/_new 2017-03-09 01:30:52.035612793 +0100 @@ -1,7 +1,7 @@ # # spec file for package fontconfig # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,9 @@ # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 Patch0: make-check.patch Patch1: fontconfig-locale_c.utf8.patch +# PATCH-FIX-UPSTREAM fontconfig-glibc-2.25.patch -- fixes build with glibc 2.25 +# http://lists.openembedded.org/pipermail/openembedded-core/2016-December/130213.html +Patch2: fontconfig-glibc-2.25.patch BuildRequires: automake >= 1.11 BuildRequires: freetype2-devel BuildRequires: libexpat-devel @@ -108,6 +111,7 @@ %endif %patch0 -p1 %patch1 -p1 +%patch2 -p1 # use suse-specific doc path: find -name \*.1 -o -name \*.sgml | xargs sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g' ++++++ fontconfig-glibc-2.25.patch ++++++ >From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem at gmail.com> Date: Sun, 11 Dec 2016 14:32:00 -0800 Subject: [PATCH] Avoid conflicts with integer width macros from TS 18661-1:2014 glibc 2.25+ has now defined these macros in <limits.h> https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a Signed-off-by: Khem Raj <raj.khem at gmail.com> --- Upstream-Status: Merged into master (1ab5258f7c2abfafcd63a760ca08bf93591912da) fontconfig/fontconfig.h | 3 ++- src/fcobjs.h | 2 +- src/fcobjshash.gperf | 2 +- src/fcobjshash.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) Index: fontconfig-2.12.1/fontconfig/fontconfig.h =================================================================== --- fontconfig-2.12.1.orig/fontconfig/fontconfig.h +++ fontconfig-2.12.1/fontconfig/fontconfig.h @@ -128,7 +128,8 @@ typedef int FcBool; #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION /* Adjust outline rasterizer */ -#define FC_CHAR_WIDTH "charwidth" /* Int */ +#define FC_CHARWIDTH "charwidth" /* Int */ +#define FC_CHAR_WIDTH FC_CHARWIDTH #define FC_CHAR_HEIGHT "charheight"/* Int */ #define FC_MATRIX "matrix" /* FcMatrix */ Index: fontconfig-2.12.1/src/fcobjs.h =================================================================== --- fontconfig-2.12.1.orig/src/fcobjs.h +++ fontconfig-2.12.1/src/fcobjs.h @@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) FC_OBJECT (RGBA, FcTypeInteger, NULL) FC_OBJECT (SCALE, FcTypeDouble, NULL) FC_OBJECT (MINSPACE, FcTypeBool, NULL) -FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) +FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) FC_OBJECT (MATRIX, FcTypeMatrix, NULL) FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) Index: fontconfig-2.12.1/src/fcobjshash.gperf =================================================================== --- fontconfig-2.12.1.orig/src/fcobjshash.gperf +++ fontconfig-2.12.1/src/fcobjshash.gperf @@ -44,7 +44,7 @@ int id; "rgba",FC_RGBA_OBJECT "scale",FC_SCALE_OBJECT "minspace",FC_MINSPACE_OBJECT -"charwidth",FC_CHAR_WIDTH_OBJECT +"charwidth",FC_CHARWIDTH_OBJECT "charheight",FC_CHAR_HEIGHT_OBJECT "matrix",FC_MATRIX_OBJECT "charset",FC_CHARSET_OBJECT Index: fontconfig-2.12.1/src/fcobjshash.h =================================================================== --- fontconfig-2.12.1.orig/src/fcobjshash.h +++ fontconfig-2.12.1/src/fcobjshash.h @@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, {-1}, #line 47 "fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, #line 48 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, #line 55 "fcobjshash.gperf"
