From patchwork Tue Aug 25 09:50:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3397 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPm3XXqz3x16 for ; Tue, 25 Aug 2020 09:50:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPk1Ck2zv9; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPj5PXVz30Wc; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPh1jcWz2xmg for ; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPg0PjQzkJ; Tue, 25 Aug 2020 09:50:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=DBnTrIeJgAAFdjoiwSKQlyh8e1DcEPBxjMS01L0npj0=; b=Oi8C0jcdhgcdtvHFN8rSUAMySYsuuA+k7t9NwT33HMQDHhwwZJQIA0BSQtyyRRgmjziaCU Ild9jZtR4V7R9UBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=DBnTrIeJgAAFdjoiwSKQlyh8e1DcEPBxjMS01L0npj0=; b=U3XoGtyaR1Y6klMul0HeUHKkQ4PQPuLGNt+KRgi2fcUMA88yIvc8da2haSYRcbDERSGwa8 z9M87fIDQjj6OcOtDQ/tijqO6JGMV92JUdpVXyENVc0vQHO5IwlLNXfZ4otVT1urBnG/2V qfC/qrUdZAiR6/eKj5YlmEy4KEQ0v+eC+jRaXGfeW4jt9WB6UKptC/f7AA7elvZus94qgf Dg73sNvBO4PLjXGp0I6Ov+TAHgUCitvpHzpZGI78VG7lH8lljcUdw7lbPhPStNxzo4e9so fs1PswMl7TulnnQex4o1Q2dT4qBp4CmFymr8XzK8duvP/yJgE67OHfph2Xgw3g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/12] fontconfig: update to 2.13.1 Date: Tue, 25 Aug 2020 09:50:29 +0000 Message-Id: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer , Khem Raj Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/fontconfig | 2 +- lfs/fontconfig | 17 +++-- ...ts-with-integer-width-macros-from-TS.patch | 72 ------------------- 3 files changed, 11 insertions(+), 80 deletions(-) delete mode 100644 src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig index e567d6df3..85fe2f442 100644 --- a/config/rootfiles/common/fontconfig +++ b/config/rootfiles/common/fontconfig @@ -33,7 +33,7 @@ usr/bin/fc-validate #usr/lib/libfontconfig.la #usr/lib/libfontconfig.so usr/lib/libfontconfig.so.1 -usr/lib/libfontconfig.so.1.9.2 +usr/lib/libfontconfig.so.1.12.0 #usr/lib/pkgconfig/fontconfig.pc #usr/share/doc/fontconfig #usr/share/doc/fontconfig/fontconfig-devel diff --git a/lfs/fontconfig b/lfs/fontconfig index 01ac3bb69..cb3f55de4 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -24,10 +24,10 @@ include Config -VER = 2.12.1 +VER = 2.13.1 THISAPP = fontconfig-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ce55e525c37147eee14cc2de6cc09f6c +$(DL_FILE)_MD5 = 36cdea1058ef13cbbfdabe6cb019dc1c install : $(TARGET) @@ -69,10 +69,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && rm -vf src/fcobjshash.h + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-docs cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch b/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch deleted file mode 100644 index cad71707a..000000000 --- a/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - fontconfig/fontconfig.h | 2 +- - src/fcobjs.h | 2 +- - src/fcobjshash.gperf | 2 +- - src/fcobjshash.h | 2 +- - 4 files changed, 4 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"