From patchwork Sat Sep 2 17:31:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 809129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xl37N5fZLz9s7M for ; Sun, 3 Sep 2017 03:31:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F18FC86CC9; Sat, 2 Sep 2017 17:31:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AzpTF4r87XXr; Sat, 2 Sep 2017 17:31:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6E9E86C7F; Sat, 2 Sep 2017 17:31:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EB0B91BFB70 for ; Sat, 2 Sep 2017 17:31:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E3A3E2F47F for ; Sat, 2 Sep 2017 17:31:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bvo2IxYlls+i for ; Sat, 2 Sep 2017 17:31:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by silver.osuosl.org (Postfix) with ESMTPS id 292172F47E for ; Sat, 2 Sep 2017 17:31:20 +0000 (UTC) Received: from fwd08.aul.t-online.de (fwd08.aul.t-online.de [172.20.26.151]) by mailout06.t-online.de (Postfix) with SMTP id 450C741E962C for ; Sat, 2 Sep 2017 19:31:17 +0200 (CEST) Received: from fli4l.lan.fli4l (Eqz3TyZQQhtG7lFbGc3t21W1ZZBc3w0pogFf+6UgUlTnXyxtr1DU18AlutzhKPrgew@[79.222.100.78]) by fwd08.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1doCGF-2MbogK0; Sat, 2 Sep 2017 19:31:11 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:46598 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1doCGD-0001aG-4u for buildroot@buildroot.org; Sat, 02 Sep 2017 19:31:10 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 2 Sep 2017 19:31:09 +0200 Message-Id: <20170902173109.22816-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: Eqz3TyZQQhtG7lFbGc3t21W1ZZBc3w0pogFf+6UgUlTnXyxtr1DU18AlutzhKPrgew X-TOI-MSGID: eb05f0fb-551e-46bc-acee-c8b4fa6cc4a5 Subject: [Buildroot] [PATCH 1/1] package/fontconfig: bump version to 2.12.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- ...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 diff --git a/package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch b/package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch deleted file mode 100644 index 80bf7a7b3..000000000 --- a/package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1ab5258f7c2abfafcd63a760ca08bf93591912da Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 -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 -Signed-off-by: Gustavo Zacarias ---- -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 - diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash index ad3582557..e9963f6f3 100644 --- a/package/fontconfig/fontconfig.hash +++ b/package/fontconfig/fontconfig.hash @@ -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 diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 8d395bccd..71a0b4579 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -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