package/fontconfig: bump version to 2.12.4
PATCH 1/1 package/fontconfig: bump version to 2.12.4
Removed patch applied upstream:
https://cgit.freedesktop.org/fontconfig/commit/?id=1ab5258f7c2abfafcd63a760ca08bf93591912da
--- ...ts-with-integer-width-macros-from-TS-1866.patch | 50 ---------------------- package/fontconfig/fontconfig.hash | 4 +- package/fontconfig/fontconfig.mk | 10 ++--- 3 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch
package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch deleted +0 -50
@@ -1,50 +0,0 @@ -From 1ab5258f7c2abfafcd63a760ca08bf93591912da Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 14 Dec 2016 16:11:05 -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 - -Create an alias for FC_CHAR_WIDTH for ABI compatibility - -Signed-off-by: Khem Raj <[email protected]> -Signed-off-by: Gustavo Zacarias <[email protected]> ---- -Patch status: upstream - - fontconfig/fontconfig.h | 3 ++- - src/fcobjs.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h -index 5c72b22..070a557 100644 ---- a/fontconfig/fontconfig.h -+++ b/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 */ - -diff --git a/src/fcobjs.h b/src/fcobjs.h -index 1fc4f65..d27864b 100644 ---- a/src/fcobjs.h -+++ b/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) --- -2.10.2 -
package/fontconfig/fontconfig.hash +2 -2
@@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/fontconfig/2016-August/005794.html -sha256 b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 fontconfig-2.12.1.tar.bz2 +# From https://lists.freedesktop.org/archives/fontconfig/2017-July/005961.html +sha256 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c fontconfig-2.12.4.tar.bz2
package/fontconfig/fontconfig.mk +3 -7
@@ -4,16 +4,12 @@ # ################################################################################ -FONTCONFIG_VERSION = 2.12.1 +FONTCONFIG_VERSION = 2.12.4 FONTCONFIG_SITE = http://fontconfig.org/release FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 FONTCONFIG_INSTALL_STAGING = YES - -# When -# 0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch is -# removed, the host-gperf dependency should be removed. -FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf -HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf host-gperf +FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf +HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING
Signature · 1 line
2.11.0
PATCH 1/1 package/fontconfig: bump version to 2.12.4
Hello,
Quoted 4 lines · Bernd Kuhls
Removed patch applied upstream:
https://cgit.freedesktop.org/fontconfig/commit/?id=1ab5258f7c2abfafcd63a760ca08bf93591912daSigned-off-by Bernd Kuhls <[email protected]>
This commit broke the build, because the host-gperf dependency is still necessary. I hadn't noticed it used to be there, so I simply reverted.
I think it's weird for fontconfig to need host-gperf, as it already ships the generated files: but the dependencies in the Makefile.am look bogus to me.
So, can we have a bump to 2.12.4 that keeps the host-gperf dependency, *and* a bug report submitted upstream about this host-gperf dependency ?
I think rules like:
fcobjshash.gperf: Makefile stamp-fcobjshash.gperf
and:
fcobjshash.h: Makefile fcobjshash.gperf
are bogus, because the configure script generates the Makefile. So the Makefile is always going to be newer than the shipped fcobjshash.h and fcobjhash.gperf, and those will always be re-generated.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/1 package/fontconfig: bump version to 2.12.4
Hi Thomas,
Am Sat, 02 Sep 2017 19:06:28 +0200 schrieb Thomas Petazzoni:
Quoted 2 lines
This commit broke the build, because the host-gperf dependency is still necessary. I hadn't noticed it used to be there, so I simply reverted.
I did not notice either because my host has gperf installed :(
Quoted 3 lines
I think it's weird for fontconfig to need host-gperf, as it already ships the generated files: but the dependencies in the Makefile.am look bogus to me.
Yes, but upstream already acted upon this and removed the generated file from the tarball: https://cgit.freedesktop.org/fontconfig/commit/?
id=651f1227646174b5be0186b4b6cdff3a7134d869
Quoted 1 line
So, can we have a bump to 2.12.4 that keeps the host-gperf dependency,
Sent http://patchwork.ozlabs.org/patch/809129/
Regards, Bernd