From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 01/12] fontconfig: update to 2.13.1
Date: Tue, 25 Aug 2020 09:50:29 +0000 [thread overview]
Message-ID: <20200825095040.3854-1-michael.tremer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5865 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
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 <raj.khem(a)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(a)gmail.com>
----
-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"
--
2.20.1
next reply other threads:[~2020-08-25 9:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 9:50 Michael Tremer [this message]
2020-08-25 9:50 ` [PATCH 02/12] freetype: Update to 2.10.2 Michael Tremer
2020-08-25 9:50 ` [PATCH 03/12] openjpeg: New package Michael Tremer
2020-08-25 9:50 ` [PATCH 04/12] qpdf: Update to 10.0.1 Michael Tremer
2020-08-25 9:50 ` [PATCH 05/12] lcms2: Update to 2.9 Michael Tremer
2020-08-25 9:50 ` [PATCH 06/12] poppler: Update to 0.89.0 Michael Tremer
2020-08-25 9:50 ` [PATCH 07/12] avahi: Update to 0.8 Michael Tremer
2020-08-25 9:50 ` [PATCH 08/12] poppler-data: New package Michael Tremer
2020-08-25 9:50 ` [PATCH 09/12] cups: Update to 2.3.3 Michael Tremer
2020-08-25 9:50 ` [PATCH 10/12] cups-filters: Update to 1.27.4 Michael Tremer
2020-08-25 9:50 ` [PATCH 11/12] foomatic: Drop files that are now provided by cups-filter Michael Tremer
2020-08-25 9:50 ` [PATCH 12/12] Rootfile update after fresh build Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200825095040.3854-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox