Skip to contentSkip to conversation

package/fontconfig: bump version to 2.12.4

PATCH New Bernd Kuhls 2 participants 2 messages Sep 2, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/fontconfig: bump version to 2.12.4

Removed patch applied upstream:
https://cgit.freedesktop.org/fontconfig/commit/?id=1ab5258f7c2abfafcd63a760ca08bf93591912da

We need to keep the host-gperf dependency even when upstream ships the generated file fcobjshash.gperf in its release tarball because in the next release this file is removed:
https://cgit.freedesktop.org/fontconfig/commit/?id=651f1227646174b5be0186b4b6cdff3a7134d869
and is always generated during build:
https://bugs.freedesktop.org/show_bug.cgi?id=101280

Signed-off-by Bernd Kuhls <[email protected]>
---
 ...ts-with-integer-width-macros-from-TS-1866.patch | 50 ----------------------
 package/fontconfig/fontconfig.hash                 |  4 +-
 package/fontconfig/fontconfig.mk                   |  6 +--
 3 files changed, 3 insertions(+), 57 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
deleted file mode 100644
index 80bf7a7b3..000000000
@@ -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
index ad3582557..e9963f6f3 100644
@@ -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 +1 -5
index 8d395bccd..71a0b4579 100644
@@ -4,14 +4,10 @@
 #
 ################################################################################
 
-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_LICENSE = fontconfig license
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH 1/1 package/fontconfig: bump version to 2.12.4

Hello,

Quoted 10 lines · Bernd Kuhls

Removed patch applied upstream:
https://cgit.freedesktop.org/fontconfig/commit/?id=1ab5258f7c2abfafcd63a760ca08bf93591912da

We need to keep the host-gperf dependency even when upstream ships the generated file fcobjshash.gperf in its release tarball because in the next release this file is removed:
https://cgit.freedesktop.org/fontconfig/commit/?id=651f1227646174b5be0186b4b6cdff3a7134d869
and is always generated during build:
https://bugs.freedesktop.org/show_bug.cgi?id=101280

Quoted 7 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 ...ts-with-integer-width-macros-from-TS-1866.patch | 50 ----------------------
 package/fontconfig/fontconfig.hash                 |  4 +-
 package/fontconfig/fontconfig.mk                   |  6 +--
 3 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com