Attachment 222112 Details for Bug 253212 – Patch for fontconfig

[patch] Patch for fontconfig

0001-fontconfig.patch (text/plain), 66.23 KB, created by Daniel Engberg on 2021-02-03 15:02:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-02-03 15:02:09 UTC

Size: 66.23 KB

patch

obsolete

>From ae95ad321b7d65a0b2fbdc3969f9300070dde9c0 Mon Sep 17 00:00:00 2001
>From: Daniel Engberg <daniel.engberg.lists@pyret.net>
>Date: Wed, 3 Feb 2021 15:41:11 +0100
>Subject: [PATCH] fontconfig
>
>fontconfig
>
>Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
>---
> x11-fonts/fontconfig/Makefile                 |   97 +-
> x11-fonts/fontconfig/distinfo                 |    6 +-
> x11-fonts/fontconfig/files/patch-2.13.92.diff | 1795 -----------------
> x11-fonts/fontconfig/files/patch-Makefile.in  |   31 -
> .../files/patch-conf.d_60-latin.conf          |   62 +
> .../fontconfig/files/patch-conf.d_meson.build |   33 +
> x11-fonts/fontconfig/files/patch-configure    |   10 -
> x11-fonts/fontconfig/files/patch-meson.build  |   36 +
> .../fontconfig/files/patch-src__fccompat.c    |   17 -
> .../fontconfig/files/patch-src_fcatomic.h     |   20 -
> x11-fonts/fontconfig/files/patch-src_fclang.c |    2 +-
> .../fontconfig/files/patch-src_meson.build    |   12 +
> x11-fonts/fontconfig/pkg-plist                |   11 +-
> 13 files changed, 191 insertions(+), 1941 deletions(-)
> delete mode 100644 x11-fonts/fontconfig/files/patch-2.13.92.diff
> delete mode 100644 x11-fonts/fontconfig/files/patch-Makefile.in
> create mode 100644 x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf
> create mode 100644 x11-fonts/fontconfig/files/patch-conf.d_meson.build
> delete mode 100644 x11-fonts/fontconfig/files/patch-configure
> create mode 100644 x11-fonts/fontconfig/files/patch-meson.build
> delete mode 100644 x11-fonts/fontconfig/files/patch-src__fccompat.c
> delete mode 100644 x11-fonts/fontconfig/files/patch-src_fcatomic.h
> create mode 100644 x11-fonts/fontconfig/files/patch-src_meson.build
>
>diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
>index d9e98163a3e0..717234d2b067 100644
>--- a/x11-fonts/fontconfig/Makefile
>+++ b/x11-fonts/fontconfig/Makefile
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	fontconfig
>-PORTVERSION=	2.13.92
>-PORTREVISION?=	2
>-PORTEPOCH?=	1
>+DISTVERSION=	2.13.93
>+PORTEPOCH=	1
> CATEGORIES=	x11-fonts
> MASTER_SITES=	https://www.freedesktop.org/software/fontconfig/release/
> 
>@@ -14,76 +13,66 @@ COMMENT=	XML-based font configuration API for X Windows
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gperf tar:xz
>-
>-.if !defined(REFERENCE_PORT)
>-
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libexpat.so:textproc/expat2
> 
>-USES+=		cpe gmake libtool pathfix pkgconfig
>+USES=		cpe gperf meson pkgconfig python:3.5+,build shebangfix tar:xz
> CPE_VENDOR=	fontconfig_project
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
>-		--with-templatedir=${PREFIX}/etc/fonts/conf.avail \
>-		--with-xmldir=${PREFIX}/etc/fonts \
>-		--with-expat-includes=${LOCALBASE}/include \
>-		--with-expat-lib=${LOCALBASE}/lib \
>-		--with-default-hinting=${PREFERRED_HINTING} \
>-		--with-default-fonts=${PREFIX}/share/fonts \
>-		--with-add-fonts=${LOCALBASE}/lib/X11/fonts \
>-		--with-cache-dir=/var/db/fontconfig \
>-		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
>-		--disable-docs
>-
>-# D6155: static linked library linking added to support statically linked
>-# 	 applications, e.g. x11/xforward static option
>-CONFIGURE_ARGS+=	--enable-static
>-
>-PKGINSTALL=	${WRKDIR}/pkg-install
>-INSTALL_TARGET=install-strip
>+
>+SHEBANG_FILES=	conf.d/link_confs.py \
>+		conf.d/write-35-lang-normalize-conf.py \
>+		fc-case/fc-case.py \
>+		fc-lang/fc-lang.py
>+
>+TEST_TARGET=	test
>+
>+# Custom configuration variables
>+FCDEFAULTFONTS=	${PREFIX}/share/fonts
>+FCADDFONTS=	${LOCALBASE}/lib/X11/fonts
>+
>+# To avoid circular depdency docs (including manpages) needs to be disabled as
>+# they depend on textproc/docbook-utils which requires fontconfig
>+MESON_ARGS=	-Ddefault_library=both -Ddoc=disabled
> 
> PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
>-PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
> 
>-OPTIONS_DEFINE=	DOCS NLS NO_BITMAPS
>-OPTIONS_DEFAULT=HINTING_SLIGHT
>+OPTIONS_DEFINE=	NLS BITMAPS TEST
>+OPTIONS_DEFAULT=BITMAPS HINTING_SLIGHT
> OPTIONS_SUB=	yes
> 
>-NO_BITMAPS_DESC=	Reject bitmap fonts by default
>-
> OPTIONS_SINGLE=	HINTING
>-HINTING_DESC=	Preferred pixel hinting configuration
> .for opt in NONE SLIGHT MEDIUM FULL
> OPTIONS_SINGLE_HINTING+=	HINTING_${opt}
> HINTING_${opt}_DESC=	${opt:tl}
> HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
> .endfor
> 
>-NLS_USES=		gettext
>-NLS_CONFIGURE_ENABLE=	nls
>+BITMAPS_DESC=	Enable bitmap fonts by default
>+HINTING_DESC=	Preferred pixel hinting configuration
>+
>+NLS_USES=		gettext-tools
>+NLS_MESON_ENABLED=	nls
>+
>+TEST_MESON_ENABLED=	tests
> 
>-post-patch-NO_BITMAPS-on:
>-	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
>-		'/^CONF_LINKS =/s|$$|\${.newline}	70-no-bitmaps.conf \\|' \
>-		${WRKSRC}/conf.d/Makefile.in
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%FCDEFAULTFONTS%%|${FCDEFAULTFONTS}|g' \
>+	    ${PATCH_WRKSRC}/meson.build
>+	@${REINPLACE_CMD} -e 's|%%FCADDFONTS%%|${FCADDFONTS}|g' \
>+	    ${PATCH_WRKSRC}/meson.build
>+	@${REINPLACE_CMD} -e 's|%%FCPREFERREDHINTING%%|${PREFERRED_HINTING}|g' \
>+	    ${PATCH_WRKSRC}/conf.d/meson.build
> 
> post-install:
>-	${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \
>-		${STAGEDIR}${PREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/doc/*.5 \
>-		${STAGEDIR}${PREFIX}/man/man5
>-	${INSTALL_DATA} ${WRKSRC}/fonts.conf \
>-		${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
>-	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
>-		s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
>-		> ${PKGINSTALL}
>-
>-post-install-DOCS-on:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
>+	${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
>+	@${MKDIR} ${STAGEDIR}/var/db/fontconfig
> 
>-.include <bsd.port.mk>
>+post-install-BITMAPS-off:
>+	${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-no-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf
>+
>+post-install-BITMAPS-on:
>+	${RM} ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf
>+	${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-yes-bitmaps.conf
> 
>-.endif
>+.include <bsd.port.mk>
>diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
>index 071c4d91fe37..4b15b7171dd2 100644
>--- a/x11-fonts/fontconfig/distinfo
>+++ b/x11-fonts/fontconfig/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1565349179
>-SHA256 (fontconfig-2.13.92.tar.xz) = 506e61283878c1726550bc94f2af26168f1e9f2106eac77eaaf0b2cdfad66e4e
>-SIZE (fontconfig-2.13.92.tar.xz) = 1413128
>+TIMESTAMP = 1612204906
>+SHA256 (fontconfig-2.13.93.tar.xz) = ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0
>+SIZE (fontconfig-2.13.93.tar.xz) = 1418288
>diff --git a/x11-fonts/fontconfig/files/patch-2.13.92.diff b/x11-fonts/fontconfig/files/patch-2.13.92.diff
>deleted file mode 100644
>index 3bd6b55c06fa..000000000000
>--- a/x11-fonts/fontconfig/files/patch-2.13.92.diff
>+++ /dev/null
>@@ -1,1795 +0,0 @@
>-# Affect FC_FONT_HAS_HINT property to score on matcher
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=cb1036a7c7f1cb79fa799b1db368c86b018ec368
>-# Add missing return type for FcFontSet* functions
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=7172f08d4231c59cf14dab9ebab714df37e352ac
>-# Do not return FcFalse from FcConfigParseAndLoad*() if complain is set to false
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=fcada522913e5e07efa6367eff87ace9f06d24c8
>-# conf: Add JoyPixels emoji font
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=65087ac7ce4cc5f2109967c1380b474955dcb590
>-# Warn as well if no directory name for cachedir provided
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=75eadca26648abf69497691ff0f4c7803b9ff23c
>-# Take effect sysroot functionality to the default config file
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=cd51cb241aad7b362b793200ca7d42595c14f52b
>-# Read latest cache in paths
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=c9862b6ea7c3234b29f6500c7d07359847e55ed7
>-# Fix a memory leak caused by the previous commit
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=a45fc8a33256d9d3ea0ea7947f33c8e5e3cc7238
>-# Use FcConfigReference/Destroy appropriately instead of FcConfigGetCurrent
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=b5bcf61fe789e66df2de609ec246cb7e4d326180
>-# Fix potential race condition in FcConfigSetCurrent and FcConfigReference
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=aa8c8cfa9fb2563482336249e3f56459099fcf6e
>-# Correct reset-dirs in DTD
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=a4aa66a858f1ecd375c5efe5916398281f73f794
>-# Don't add a value for FC_FULLNAME in meta face
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=8249f871b373db5c6559f8c48242beed612b23a0
>-# Add proper fullname for named-instances
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=452be8125f0e2a18a7dfef469e05d19374d36307
>-# Fix the process substitution doesn't work with FONTCONFIG_FILE
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=71d6866d381a0ab3585eb9ee760aeec98e722359
>-# Fix memory leaks
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=61573ad5f7c4dd0860d613d99d0086433240eb75
>-# Set name_mapping to NULL after freeing to avoid risk of double-free.
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=6edaaa4d1823518a97fb4cc3004d110b1046f742
>-# Fix assertion in FcFini()
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=fbc05949ef52c8a8d69233eed77f6636dffec280
>-# Set exact boolean value to color property
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=d3bfbea7dc53aa7fa52aa9616235a23d4507da1b
>-# Fix assertion in FcCacheFini() again
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=6f6b39780215714386606ca1c5457a7106639ff4
>-
>-Excluding changes for the following files: test/Makefile.am, test/run-test.sh,
>-test/test-bz1744377.c, test/test-crbug1004254.c, test/test-issue180.c.
>-
>---- conf.d/45-generic.conf.orig	2018-06-05 10:36:38 UTC
>-+++ conf.d/45-generic.conf
>-@@ -38,6 +38,10 @@
>- 		<default><family>emoji</family></default>
>- 	</alias>
>- 	<alias binding="same">
>-+		<family>JoyPixels</family>
>-+		<default><family>emoji</family></default>
>-+	</alias>
>-+	<alias binding="same">
>- 		<family>Emoji One</family>
>- 		<default><family>emoji</family></default>
>- 	</alias>
>---- conf.d/60-generic.conf.orig	2018-06-05 10:36:38 UTC
>-+++ conf.d/60-generic.conf
>-@@ -42,6 +42,7 @@
>- 			<family>EmojiOne Mozilla</family> 
>- 			
>- 			<family>Emoji Two</family>
>-+			<family>JoyPixels</family>
>- 			<family>Emoji One</family>
>- 			
>- 			<family>Noto Emoji</family> 
>---- doc/fcconfig.fncs.orig	2019-05-08 08:22:25 UTC
>-+++ doc/fcconfig.fncs
>-@@ -174,6 +174,10 @@ Returns one of the two sets of fonts fro
>- by <parameter>set</parameter>. This font set is owned by the library and must
>- not be modified or freed.
>- If <parameter>config</parameter> is NULL, the current configuration is used.
>-+    </para><para>
>-+This function isn't MT-safe. <function>FcConfigReference</function> must be called
>-+before using this and then <function>FcConfigDestroy</function> when
>-+the return value is no longer referenced.
>- @@
>- 
>- @RET@           FcBlanks *
>-@@ -344,6 +348,15 @@ to be up to date, and used.
>- @TYPE1@         const FcChar8 *			@ARG1@          name
>- @PURPOSE@	Find a config file
>- @DESC@
>-+This function is deprecated and is replaced by <function>FcConfigGetFilename</function>.
>-+@@
>-+
>-+@RET@           FcChar8 *
>-+@FUNC@          FcConfigGetFilename
>-+@TYPE1@         FcConfig *			@ARG1@          config
>-+@TYPE2@         const FcChar8 *			@ARG2@          name
>-+@PURPOSE@	Find a config file
>-+@DESC@
>- Given the specified external entity name, return the associated filename.
>- This provides applications a way to convert various configuration file
>- references into filename form.
>-@@ -355,6 +368,8 @@ refers to a file in the current users ho
>- doesn't start with '/', it refers to a file in the default configuration
>- directory; the built-in default directory can be overridden with the
>- FONTCONFIG_PATH environment variable.
>-+    </para><para>
>-+The result of this function is affected by the FONTCONFIG_SYSROOT environment variable or equivalent functionality.
>- @@
>- 
>- @RET@		FcBool
>-@@ -396,6 +411,10 @@ parse error, semantic error or allocatio
>- Obtains the system root directory in 'config' if available. All files
>- (including file properties in patterns) obtained from this 'config' are
>- relative to this system root directory.
>-+    </para><para>
>-+This function isn't MT-safe. <function>FcConfigReference</function> must be called
>-+before using this and then <function>FcConfigDestroy</function> when
>-+the return value is no longer referenced.
>- @SINCE@		2.10.92
>- @@
>- 
>-@@ -422,6 +441,10 @@ When setting this on the current config 
>- @PURPOSE@	Initialize the iterator
>- @DESC@
>- Initialize 'iter' with the first iterator in the config file information list.
>-+    </para><para>
>-+This function isn't MT-safe. <function>FcConfigReference</function> must be called
>-+before using this and then <function>FcConfigDestroy</function> when the relevant
>-+values are no longer referenced.
>- @SINCE@		2.12.91
>- @@
>- 
>-@@ -433,6 +456,10 @@ Initialize 'iter' with the first iterato
>- @DESC@
>- Set 'iter' to point to the next node in the config file information list.
>- If there is no next node, FcFalse is returned.
>-+    </para><para>
>-+This function isn't MT-safe. <function>FcConfigReference</function> must be called
>-+before using <function>FcConfigFileInfoIterInit</function> and then
>-+<function>FcConfigDestroy</function> when the relevant values are no longer referenced.
>- @SINCE@		2.12.91
>- @@
>- 
>-@@ -448,5 +475,9 @@ If there is no next node, FcFalse is ret
>- Obtain the filename, the description and the flag whether it is enabled or not
>- for 'iter' where points to current configuration file information.
>- If the iterator is invalid, FcFalse is returned.
>-+    </para><para>
>-+This function isn't MT-safe. <function>FcConfigReference</function> must be called
>-+before using <function>FcConfigFileInfoIterInit</function> and then
>-+<function>FcConfigDestroy</function> when the relevant values are no longer referenced.
>- @SINCE@		2.12.91
>- @@
>---- doc/fcfontset.fncs.orig	2016-07-11 02:41:05 UTC
>-+++ doc/fcfontset.fncs
>-@@ -97,7 +97,7 @@ of the output is designed to be of help 
>- change at any time.
>- @@
>- 
>--@RET@		
>-+@RET@		FcFontSet *
>- @FUNC@		FcFontSetSort
>- @TYPE1@         FcConfig *			@ARG1@		config
>- @TYPE2@		FcFontSet **			@ARG2@		sets
>-@@ -128,7 +128,7 @@ modify these patterns.  Instead, they sh
>- The FcFontSet returned by FcFontSetSort is destroyed by calling FcFontSetDestroy.
>- @@
>- 
>--@RET@		
>-+@RET@		void
>- @FUNC@		FcFontSetSortDestroy
>- @TYPE1@		FcFontSet *			@ARG1@		set
>- @PURPOSE@	DEPRECATED destroy a font set
>---- fontconfig/fontconfig.h.orig	2019-08-09 11:09:32 UTC
>-+++ fontconfig/fontconfig.h
>-@@ -375,7 +375,7 @@ FcPublic FcBool
>- FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose);
>- 
>- FcPublic void
>--FcCacheCreateTagFile (const FcConfig *config);
>-+FcCacheCreateTagFile (FcConfig *config);
>- 
>- FcPublic FcBool
>- FcDirCacheCreateUUID (FcChar8  *dir,
>-@@ -394,6 +394,10 @@ FcPublic FcBool
>- FcConfigEnableHome (FcBool enable);
>- 
>- FcPublic FcChar8 *
>-+FcConfigGetFilename (FcConfig      *config,
>-+		     const FcChar8 *url);
>-+
>-+FcPublic FcChar8 *
>- FcConfigFilename (const FcChar8 *url);
>-     
>- FcPublic FcConfig *
>-@@ -433,7 +437,7 @@ FcPublic FcBlanks *
>- FcConfigGetBlanks (FcConfig *config);
>- 
>- FcPublic FcStrList *
>--FcConfigGetCacheDirs (const FcConfig	*config);
>-+FcConfigGetCacheDirs (FcConfig	*config);
>- 
>- FcPublic int
>- FcConfigGetRescanInterval (FcConfig *config);
>---- fonts.dtd.orig	2019-05-08 08:22:25 UTC
>-+++ fonts.dtd
>-@@ -124,7 +124,7 @@
>- 
>--<!ELEMENT reset-dirs >
>-+<!ELEMENT reset-dirs EMPTY>
>- 
>- 
>++			<family>Verdana</family>
>+ 			<family>Tahoma</family> 
>++			<family>Albany AMT</family>
>+ 		</prefer>
>+ 	</alias>
>+ 	<alias>
>+ 		<family>monospace</family>
>+ 		<prefer>
>++			<family>Liberation Mono</family>
>+ 			<family>DejaVu Sans Mono</family>
>+ 			<family>Inconsolata</family>
>+ 			<family>Andale Mono</family>
>+ 			<family>Courier New</family>
>+-			<family>Cumberland AMT</family>
>+ 			<family>Luxi Mono</family>
>+ 			<family>Nimbus Mono L</family>
>+ 			<family>Nimbus Mono</family>
>+ 			<family>Nimbus Mono PS</family>
>+ 			<family>Courier</family>
>++			<family>Cumberland AMT</family>
>+ 		</prefer>
>+ 	</alias>
>+ <!--
>+@@ -63,6 +66,7 @@
>+ 	<alias>
>+ 		<family>cursive</family>
>+ 		<prefer>
>++			<family>Comic Neue</family>
>+ 			<family>ITC Zapf Chancery Std</family>
>+ 			<family>Zapfino</family>
>+ 			<family>Comic Sans MS</family>
>diff --git a/x11-fonts/fontconfig/files/patch-conf.d_meson.build b/x11-fonts/fontconfig/files/patch-conf.d_meson.build
>new file mode 100644
>index 000000000000..e5eb8ac9e24a
>--- /dev/null
>+++ b/x11-fonts/fontconfig/files/patch-conf.d_meson.build
>@@ -0,0 +1,33 @@
>+--- conf.d/meson.build.orig	2020-11-28 01:56:42 UTC
>++++ conf.d/meson.build
>+@@ -37,7 +37,7 @@ conf_files = [
>+   '90-synthetic.conf',
>+ ]
>+ 
>+-preferred_hinting = 'slight'
>++preferred_hinting = '%%FCPREFERREDHINTING%%'
>+ 
>+ conf_links = [
>+   '10-hinting-@0@.conf'.format(preferred_hinting),
>+@@ -59,10 +59,10 @@ conf_links = [
>+   '90-synthetic.conf',
>+ ]
>+ 
>+-install_data(conf_files, install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'))
>++install_data(conf_files, install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'))
>+ 
>+ meson.add_install_script('link_confs.py',
>+-  join_paths(get_option('prefix'), get_option('datadir'), 'fontconfig/conf.avail'),
>++  join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts/conf.avail'),
>+   join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
>+   conf_links,
>+ )
>+@@ -79,7 +79,7 @@ endforeach
>+ custom_target('35-lang-normalize.conf',
>+   output: '35-lang-normalize.conf',
>+   command: [find_program('write-35-lang-normalize-conf.py'), ','.join(orths), '@OUTPUT@'],
>+-  install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'),
>++  install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'),
>+   install: true)
>+ 
>+ # README
>diff --git a/x11-fonts/fontconfig/files/patch-configure b/x11-fonts/fontconfig/files/patch-configure
>deleted file mode 100644
>index cee01600a205..000000000000
>--- a/x11-fonts/fontconfig/files/patch-configure
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- configure.orig	2016-08-05 05:49:14 UTC
>-+++ configure
>-@@ -654,6 +654,7 @@ ax_pthread_config
>- XMLDIR
>- CONFIGDIR
>- BASECONFIGDIR
>-+baseconfigdir
>- TEMPLATEDIR
>- FC_FONTDATE
>- FC_CACHEDIR
>diff --git a/x11-fonts/fontconfig/files/patch-meson.build b/x11-fonts/fontconfig/files/patch-meson.build
>new file mode 100644
>index 000000000000..e0cf68262003
>--- /dev/null
>+++ b/x11-fonts/fontconfig/files/patch-meson.build
>@@ -0,0 +1,36 @@
>+--- meson.build.orig	2020-11-28 02:38:31 UTC
>++++ meson.build
>+@@ -212,19 +212,19 @@ else
>+     conf.set_quoted('FC_DEFAULT_FONTS', '<dir>/System/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font3</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font4</dir>')
>+     fonts_conf.set('FC_DEFAULT_FONTS', '<dir>/System/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font3</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font4</dir>')
>+   else
>+-    conf.set_quoted('FC_DEFAULT_FONTS', '<dir>/usr/share/fonts</dir>')
>+-    fonts_conf.set('FC_DEFAULT_FONTS', '<dir>/usr/share/fonts</dir>')
>++    conf.set_quoted('FC_DEFAULT_FONTS', '<dir>%%FCDEFAULTFONTS%%</dir> <dir>%%FCADDFONTS%%</dir>')
>++    fonts_conf.set('FC_DEFAULT_FONTS', '<dir>%%FCDEFAULTFONTS%%</dir> <dir>%%FCADDFONTS%%</dir>')
>+   endif
>+-  fc_cachedir = join_paths(prefix, get_option('localstatedir'), 'cache', meson.project_name())
>++  fc_cachedir = '/var/db/fontconfig'
>+   thread_dep = dependency('threads')
>+   conf.set('HAVE_PTHREAD', 1)
>+   deps += [thread_dep]
>+ endif
>+ 
>+-fc_templatedir = join_paths(prefix, get_option('datadir'), 'fontconfig/conf.avail')
>++fc_templatedir = join_paths(prefix, get_option('sysconfdir'), 'fonts/conf.avail')
>+ fc_baseconfigdir = join_paths(prefix, get_option('sysconfdir'), 'fonts')
>+ fc_configdir = join_paths(fc_baseconfigdir, 'conf.d')
>+-fc_xmldir = join_paths(prefix, get_option('datadir'), 'xml/fontconfig')
>++fc_xmldir = join_paths(prefix, get_option('sysconfdir'), 'fonts')
>+ 
>+ 
>+ conf.set_quoted('CONFIGDIR', fc_configdir)
>+@@ -361,7 +361,7 @@ configure_file(output: 'fonts.conf',
>+   install: true)
>+ 
>+ install_data('fonts.dtd',
>+-  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'xml/fontconfig')
>++  install_dir: join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts')
>+ )
>+ 
>+ fc_headers = [
>diff --git a/x11-fonts/fontconfig/files/patch-src__fccompat.c b/x11-fonts/fontconfig/files/patch-src__fccompat.c
>deleted file mode 100644
>index d8937770d156..000000000000
>--- a/x11-fonts/fontconfig/files/patch-src__fccompat.c
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-There is an undiagnosed ARMv6 core dump in this code
>-as discovered in FreeBSD Bug 183536 when using clang.
>-Removing this code from ARM builds resolves it.
>-
>-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=183536
>-
>---- src/fccompat.c.orig	2016-07-11 02:41:06 UTC
>-+++ src/fccompat.c
>-@@ -191,7 +191,7 @@ FcRandom(void)
>- #else
>-     random_r (&fcrandbuf, &result);
>- #endif
>--#elif HAVE_RANDOM
>-+#elif HAVE_RANDOM && !defined(__arm__)
>-     static char statebuf[256];
>-     char *state;
>-     static FcBool initialized = FcFalse;
>diff --git a/x11-fonts/fontconfig/files/patch-src_fcatomic.h b/x11-fonts/fontconfig/files/patch-src_fcatomic.h
>deleted file mode 100644
>index c3927ff79d5e..000000000000
>--- a/x11-fonts/fontconfig/files/patch-src_fcatomic.h
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- src/fcatomic.h.orig	2016-07-11 02:41:06 UTC
>-+++ src/fcatomic.h
>-@@ -96,7 +96,17 @@ typedef int fc_atomic_int_t;
>- #define fc_atomic_int_add(AI, V)	__sync_fetch_and_add (&(AI), (V))
>- 
>- #define fc_atomic_ptr_get(P)		(void *) (__sync_synchronize (), *(P))
>-+#if defined(__FreeBSD__) && defined(__mips_n64)
>-+#include <sys/types.h>
>-+#include <machine/atomic.h>
>-+#define fc_atomic_ptr_cmpexch(P,O,N)	atomic_cmpset_rel_64 ((uint64_t *)(P), (uint64_t)(O), (uint64_t)(N))
>-+#elif defined(__FreeBSD__) && defined(__mips)
>-+#include <sys/types.h>
>-+#include <machine/atomic.h>
>-+#define fc_atomic_ptr_cmpexch(P,O,N)	atomic_cmpset_rel_32 ((uint32_t *)(P), (uint32_t)(O), (uint32_t)(N))
>-+#else
>- #define fc_atomic_ptr_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
>-+#endif /* defined(__FreeBSD__) && defined(__mips__) */
>- 
>- 
>- #elif !defined(FC_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)
>diff --git a/x11-fonts/fontconfig/files/patch-src_fclang.c b/x11-fonts/fontconfig/files/patch-src_fclang.c
>index c72967a31296..873307acda2c 100644
>--- a/x11-fonts/fontconfig/files/patch-src_fclang.c
>+++ b/x11-fonts/fontconfig/files/patch-src_fclang.c
>@@ -1,4 +1,4 @@
>---- src/fclang.c.orig	2017-09-21 04:44:27 UTC
>+--- src/fclang.c.orig	2020-11-28 01:56:42 UTC
> +++ src/fclang.c
> @@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang)
>  {
>diff --git a/x11-fonts/fontconfig/files/patch-src_meson.build b/x11-fonts/fontconfig/files/patch-src_meson.build
>new file mode 100644
>index 000000000000..e637caeb028f
>--- /dev/null
>+++ b/x11-fonts/fontconfig/files/patch-src_meson.build
>@@ -0,0 +1,12 @@
>+--- src/meson.build.orig	2020-11-28 01:56:42 UTC
>++++ src/meson.build
>+@@ -88,7 +88,7 @@ pkgmod.generate(libfontconfig,
>+   version: fc_version,
>+   variables: [
>+     'sysconfdir=@0@'.format(join_paths(prefix, get_option('sysconfdir'))),
>+-    'localstatedir=@0@'.format(join_paths(prefix, get_option('localstatedir'))),
>++    'localstatedir=/var',
>+     'confdir=${sysconfdir}/fonts',
>+-    'cachedir=${localstatedir}/cache/fontconfig',
>++    'cachedir=/var/db/fontconfig',
>+   ])
>diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
>index d04090217e2f..27e6889f2c20 100644
>--- a/x11-fonts/fontconfig/pkg-plist
>+++ b/x11-fonts/fontconfig/pkg-plist
>@@ -60,6 +60,7 @@ etc/fonts/conf.d/65-fonts-persian.conf
> etc/fonts/conf.d/65-nonlatin.conf
> etc/fonts/conf.d/69-unifont.conf
> %%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf
>+%%BITMAPS%%etc/fonts/conf.d/70-yes-bitmaps.conf
> etc/fonts/conf.d/80-delicious.conf
> etc/fonts/conf.d/90-synthetic.conf
> etc/fonts/conf.d/README
>@@ -73,16 +74,6 @@ lib/libfontconfig.so
> lib/libfontconfig.so.1
> lib/libfontconfig.so.1.12.0
> libdata/pkgconfig/fontconfig.pc
>-man/man1/fc-cache.1.gz
>-man/man1/fc-cat.1.gz
>-man/man1/fc-conflist.1.gz
>-man/man1/fc-list.1.gz
>-man/man1/fc-match.1.gz
>-man/man1/fc-pattern.1.gz
>-man/man1/fc-query.1.gz
>-man/man1/fc-scan.1.gz
>-man/man1/fc-validate.1.gz
>-man/man5/fonts-conf.5.gz
> share/gettext/its/fontconfig.its
> share/gettext/its/fontconfig.loc
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
>-- 
>2.30.0
>

Actions: View | Diff

Attachments on bug 253212: 222112 | 222157