* Re: [PR PATCH] [Updated] fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
@ 2022-06-24 12:54 ` zlice
2022-06-24 13:04 ` zlice
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-24 12:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages fontconfig_2.13.96
https://github.com/void-linux/void-packages/pull/37670
fontconfig: update to 2.13.96.
#### Testing the changes
- I tested the changes in this PR: **yes**
- I built this PR locally for my native architecture, **x86_64**
#### Comments
Besides being from 2018, there are a few bugs related to `~/.local/share/fonts` causing font rebuilds of some sort in Firefox. This leads to crashes and random windows/menus closing. Updating to this so far seems to have fixed that with minor testing.
A patch file from https://github.com/void-linux/void-packages/pull/37670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fontconfig_2.13.96-37670.patch --]
[-- Type: text/x-diff, Size: 1442 bytes --]
From e7ba52d3782de3168e11d68e4ae514e7d11aaf9b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 24 Jun 2022 08:49:16 -0400
Subject: [PATCH] fontconfig: update to 2.13.96.
---
srcpkgs/fontconfig/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea240..452368da94e6 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,18 +1,18 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.13.1
-revision=3
+version=2.13.96
+revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
hostmakedepends="gperf pkg-config"
-makedepends="expat-devel freetype-devel libuuid-devel"
+makedepends="expat-devel freetype-devel libuuid-devel python3"
conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2"
-checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
+distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
+checksum=d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637
pre_build() {
# trick to regenerate hash functions :-)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
2022-06-24 12:54 ` [PR PATCH] [Updated] " zlice
@ 2022-06-24 13:04 ` zlice
2022-06-24 13:07 ` zlice
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-24 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages fontconfig_2.13.96
https://github.com/void-linux/void-packages/pull/37670
fontconfig: update to 2.13.96.
#### Testing the changes
- I tested the changes in this PR: **yes**
- I built this PR locally for my native architecture, **x86_64**
#### Comments
Besides being from 2018, there are a few bugs related to `~/.local/share/fonts` causing font rebuilds of some sort in Firefox. This leads to crashes and random windows/menus closing. Updating to this so far seems to have fixed that with minor testing.
A patch file from https://github.com/void-linux/void-packages/pull/37670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fontconfig_2.13.96-37670.patch --]
[-- Type: text/x-diff, Size: 1421 bytes --]
From 495407b5f1bb5e2658b551fa3d6c5ea727f9415e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 24 Jun 2022 08:49:16 -0400
Subject: [PATCH] fontconfig: update to 2.13.96
---
srcpkgs/fontconfig/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea240..dbd9f579eb72 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,18 +1,18 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.13.1
-revision=3
+version=2.13.96
+revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
-hostmakedepends="gperf pkg-config"
+hostmakedepends="gperf pkg-config python3"
makedepends="expat-devel freetype-devel libuuid-devel"
conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2"
-checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
+distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
+checksum=d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637
pre_build() {
# trick to regenerate hash functions :-)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
2022-06-24 12:54 ` [PR PATCH] [Updated] " zlice
2022-06-24 13:04 ` zlice
@ 2022-06-24 13:07 ` zlice
2022-06-27 15:42 ` [PR PATCH] [Updated] " zlice
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-24 13:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/37670#issuecomment-1165557403
Comment:
The `make check` passes on my system, so I'm not sure what's going on there. Probably some container shenanigans?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
` (2 preceding siblings ...)
2022-06-24 13:07 ` zlice
@ 2022-06-27 15:42 ` zlice
2022-06-27 15:53 ` zlice
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-27 15:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages fontconfig_2.13.96
https://github.com/void-linux/void-packages/pull/37670
fontconfig: update to 2.13.96.
#### Testing the changes
- I tested the changes in this PR: **yes**
- I built this PR locally for my native architecture, **x86_64**
#### Comments
Besides being from 2018, there are a few bugs related to `~/.local/share/fonts` causing font rebuilds of some sort in Firefox. This leads to crashes and random windows/menus closing. Updating to this so far seems to have fixed that with minor testing.
A patch file from https://github.com/void-linux/void-packages/pull/37670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fontconfig_2.13.96-37670.patch --]
[-- Type: text/x-diff, Size: 2239 bytes --]
From 82caa72f4fa2621ff7a2e9f01f11fc34634c7480 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 24 Jun 2022 08:49:16 -0400
Subject: [PATCH] fontconfig: update to 2.13.96
---
srcpkgs/fontconfig/patches/runtest-dir.patch | 12 ++++++++++++
srcpkgs/fontconfig/template | 10 +++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/fontconfig/patches/runtest-dir.patch
diff --git a/srcpkgs/fontconfig/patches/runtest-dir.patch b/srcpkgs/fontconfig/patches/runtest-dir.patch
new file mode 100644
index 000000000000..c396ff9cb7eb
--- /dev/null
+++ b/srcpkgs/fontconfig/patches/runtest-dir.patch
@@ -0,0 +1,12 @@
+--- a/test/run-test.sh 2021-07-20 07:02:19.000000000 -0400
++++ b/test/run-test.sh 2022-06-27 11:41:32.577162665 -0400
+@@ -32,7 +32,8 @@
+ TESTDIR=${srcdir-"$MyPWD"}
+ BUILDTESTDIR=${builddir-"$MyPWD"}
+
+-BASEDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
++#BASEDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
++BASEDIR=$MyPWD
+ FONTDIR="$BASEDIR"/fonts
+ CACHEDIR="$BASEDIR"/cache.dir
+ EXPECTED=${EXPECTED-"out.expected"}
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea240..dbd9f579eb72 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,18 +1,18 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.13.1
-revision=3
+version=2.13.96
+revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
-hostmakedepends="gperf pkg-config"
+hostmakedepends="gperf pkg-config python3"
makedepends="expat-devel freetype-devel libuuid-devel"
conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2"
-checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
+distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
+checksum=d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637
pre_build() {
# trick to regenerate hash functions :-)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
` (3 preceding siblings ...)
2022-06-27 15:42 ` [PR PATCH] [Updated] " zlice
@ 2022-06-27 15:53 ` zlice
2022-06-27 15:56 ` zlice
2022-06-27 15:56 ` [PR PATCH] [Closed]: " zlice
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-27 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages fontconfig_2.13.96
https://github.com/void-linux/void-packages/pull/37670
fontconfig: update to 2.13.96.
#### Testing the changes
- I tested the changes in this PR: **yes**
- I built this PR locally for my native architecture, **x86_64**
#### Comments
Besides being from 2018, there are a few bugs related to `~/.local/share/fonts` causing font rebuilds of some sort in Firefox. This leads to crashes and random windows/menus closing. Updating to this so far seems to have fixed that with minor testing.
A patch file from https://github.com/void-linux/void-packages/pull/37670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fontconfig_2.13.96-37670.patch --]
[-- Type: text/x-diff, Size: 23292 bytes --]
From 3ef9e6e851e3d2639b4f43bd8790f35f9a06f21b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 24 Jun 2022 08:49:16 -0400
Subject: [PATCH] fontconfig: update to 2.13.96
---
srcpkgs/fontconfig/patches/run-test.patch | 588 ++++++++++++++++++++++
srcpkgs/fontconfig/template | 10 +-
2 files changed, 593 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/fontconfig/patches/run-test.patch
diff --git a/srcpkgs/fontconfig/patches/run-test.patch b/srcpkgs/fontconfig/patches/run-test.patch
new file mode 100644
index 000000000000..61afd22d831e
--- /dev/null
+++ b/srcpkgs/fontconfig/patches/run-test.patch
@@ -0,0 +1,588 @@
+--- a/test/run-test.sh 2021-07-20 07:02:19.000000000 -0400
++++ b/test/run-test.sh 2018-08-29 05:50:41.000000000 -0400
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # fontconfig/test/run-test.sh
+ #
+ # Copyright © 2000 Keith Packard
+@@ -20,54 +20,39 @@
+ # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+-set -e
+-
+-: "${TMPDIR=/tmp}"
+-
+ case "$OSTYPE" in
+- msys ) MyPWD=$(pwd -W) ;; # On Msys/MinGW, returns a MS Windows style path.
+- * ) MyPWD=$(pwd) ;; # On any other platforms, returns a Unix style path.
++ msys ) MyPWD=`pwd -W` ;; # On Msys/MinGW, returns a MS Windows style path.
++ * ) MyPWD=`pwd` ;; # On any other platforms, returns a Unix style path.
+ esac
+
+ TESTDIR=${srcdir-"$MyPWD"}
+ BUILDTESTDIR=${builddir-"$MyPWD"}
+
+-BASEDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-FONTDIR="$BASEDIR"/fonts
+-CACHEDIR="$BASEDIR"/cache.dir
++FONTDIR="$MyPWD"/fonts
++CACHEDIR="$MyPWD"/cache.dir
+ EXPECTED=${EXPECTED-"out.expected"}
+
+-FCLIST="$LOG_COMPILER ../fc-list/fc-list$EXEEXT"
+-FCCACHE="$LOG_COMPILER ../fc-cache/fc-cache$EXEEXT"
++ECHO=true
++
++FCLIST=../fc-list/fc-list$EXEEXT
++FCCACHE=../fc-cache/fc-cache$EXEEXT
+
+-if [ -x "$(command -v bwrap)" ]; then
+- BWRAP="$(command -v bwrap)"
++which bwrap > /dev/null 2>&1
++if [ $? -eq 0 ]; then
++ BWRAP=`which bwrap`
+ fi
+
+ FONT1=$TESTDIR/4x6.pcf
+ FONT2=$TESTDIR/8x16.pcf
+-TEST=""
+-
+-clean_exit() {
+- rc=$?
+- trap - INT TERM ABRT EXIT
+- if [ "x$TEST" != "x" ]; then
+- echo "Aborting from '$TEST' with the exit code $rc"
+- fi
+- exit $rc
+-}
+-trap clean_exit INT TERM ABRT EXIT
+
+ check () {
+- {
+- $FCLIST - family pixelsize | sort;
+- echo "=";
+- $FCLIST - family pixelsize | sort;
+- echo "=";
+- $FCLIST - family pixelsize | sort;
+- } > out
++ $FCLIST - family pixelsize | sort > out
++ echo "=" >> out
++ $FCLIST - family pixelsize | sort >> out
++ echo "=" >> out
++ $FCLIST - family pixelsize | sort >> out
+ tr -d '\015' <out >out.tmp; mv out.tmp out
+- if cmp out "$BUILDTESTDIR"/"$EXPECTED" > /dev/null ; then : ; else
++ if cmp out $BUILDTESTDIR/$EXPECTED > /dev/null ; then : ; else
+ echo "*** Test failed: $TEST"
+ echo "*** output is in 'out', expected output in '$EXPECTED'"
+ exit 1
+@@ -76,396 +61,197 @@
+ }
+
+ prep() {
+- rm -rf "$CACHEDIR"
+- rm -rf "$FONTDIR"
+- mkdir "$FONTDIR"
++ rm -rf $CACHEDIR
++ rm -rf $FONTDIR
++ mkdir $FONTDIR
+ }
+
+ dotest () {
+ TEST=$1
+- test x"$VERBOSE" = x || echo "Running: $TEST"
++ test x$VERBOSE = x || echo Running: $TEST
+ }
+
+ sed "s!@FONTDIR@!$FONTDIR!
+-s!@REMAPDIR@!!
+-s!@CACHEDIR@!$CACHEDIR!" < "$TESTDIR"/fonts.conf.in > fonts.conf
++s!@CACHEDIR@!$CACHEDIR!" < $TESTDIR/fonts.conf.in > fonts.conf
+
+ FONTCONFIG_FILE="$MyPWD"/fonts.conf
+ export FONTCONFIG_FILE
+
+ dotest "Basic check"
+ prep
+-cp "$FONT1" "$FONT2" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
+-fi
++cp $FONT1 $FONT2 $FONTDIR
+ check
+
+ dotest "With a subdir"
+ prep
+-cp "$FONT1" "$FONT2" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
+-fi
+-$FCCACHE "$FONTDIR"
++cp $FONT1 $FONT2 $FONTDIR
++$FCCACHE $FONTDIR
+ check
+
+ dotest "Subdir with a cache file"
+ prep
+-mkdir "$FONTDIR"/a
+-cp "$FONT1" "$FONT2" "$FONTDIR"/a
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"/a
+-fi
+-$FCCACHE "$FONTDIR"/a
++mkdir $FONTDIR/a
++cp $FONT1 $FONT2 $FONTDIR/a
++$FCCACHE $FONTDIR/a
+ check
+
+ dotest "Complicated directory structure"
+ prep
+-mkdir "$FONTDIR"/a
+-mkdir "$FONTDIR"/a/a
+-mkdir "$FONTDIR"/b
+-mkdir "$FONTDIR"/b/a
+-cp "$FONT1" "$FONTDIR"/a
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"/a
+-fi
+-cp "$FONT2" "$FONTDIR"/b/a
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"/b/a
+-fi
++mkdir $FONTDIR/a
++mkdir $FONTDIR/a/a
++mkdir $FONTDIR/b
++mkdir $FONTDIR/b/a
++cp $FONT1 $FONTDIR/a
++cp $FONT2 $FONTDIR/b/a
+ check
+
+ dotest "Subdir with an out-of-date cache file"
+ prep
+-mkdir "$FONTDIR"/a
+-$FCCACHE "$FONTDIR"/a
++mkdir $FONTDIR/a
++$FCCACHE $FONTDIR/a
+ sleep 1
+-cp "$FONT1" "$FONT2" "$FONTDIR"/a
++cp $FONT1 $FONT2 $FONTDIR/a
+ check
+
+ dotest "Dir with an out-of-date cache file"
+ prep
+-cp "$FONT1" "$FONTDIR"
+-$FCCACHE "$FONTDIR"
++cp $FONT1 $FONTDIR
++$FCCACHE $FONTDIR
+ sleep 1
+-mkdir "$FONTDIR"/a
+-cp "$FONT2" "$FONTDIR"/a
++mkdir $FONTDIR/a
++cp $FONT2 $FONTDIR/a
+ check
+
+-dotest "Keep mtime of the font directory"
++dotest "Re-creating .uuid"
+ prep
+-cp "$FONT1" "$FONTDIR"
+-touch -d @0 "$FONTDIR"
+-stat -c '%y' "$FONTDIR" > out1
+-$FCCACHE "$FONTDIR"
+-stat -c '%y' "$FONTDIR" > out2
++cp $FONT1 $FONTDIR
++$FCCACHE $FONTDIR
++cat $FONTDIR/.uuid > out1
++$FCCACHE -f $FONTDIR
++cat $FONTDIR/.uuid > out2
+ if cmp out1 out2 > /dev/null ; then : ; else
+- echo "*** Test failed: $TEST"
+- echo "mtime was modified"
+- exit 1
+-fi
+-
+-if [ x"$BWRAP" != "x" ] && [ "x$EXEEXT" = "x" ]; then
+-dotest "Basic functionality with the bind-mounted cache dir"
+-prep
+-cp "$FONT1" "$FONT2" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
++ echo "*** Test failed: $TEST"
++ echo "*** .uuid was modified unexpectedly"
++ exit 1
+ fi
+-$FCCACHE "$FONTDIR"
+-sleep 1
+-ls -l "$CACHEDIR" > out1
+-TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
+-s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
+-s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f "%{file}\n" ":foundry=Misc" > xxx
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" | sort > flist1
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev find "$TESTTMPDIR"/fonts/ -type f -name '*.pcf' | sort > flist2
+-ls -l "$CACHEDIR" > out2
+-if cmp out1 out2 > /dev/null ; then : ; else
++$FCCACHE -r $FONTDIR
++cat $FONTDIR/.uuid > out2
++if cmp out1 out2 > /dev/null ; then
+ echo "*** Test failed: $TEST"
+- echo "cache was created/updated."
+- echo "Before:"
+- cat out1
+- echo "After:"
+- cat out2
++ echo "*** .uuid wasn't modified"
+ exit 1
+ fi
+-if [ x"$(cat xxx)" != "x$TESTTMPDIR/fonts/4x6.pcf" ]; then
++rm -f out1 out2
++
++dotest "Consistency between .uuid and cache name"
++prep
++cp $FONT1 $FONTDIR
++$FCCACHE $FONTDIR
++cat $FONTDIR/.uuid
++$FCCACHE -r $FONTDIR
++uuid=`cat $FONTDIR/.uuid`
++ls $CACHEDIR/$uuid*
++if [ $? != 0 ]; then
+ echo "*** Test failed: $TEST"
+- echo "file property doesn't point to the new place: $TESTTMPDIR/fonts/4x6.pcf"
++ echo "No cache for $uuid"
++ ls $CACHEDIR
+ exit 1
+ fi
+-if cmp flist1 flist2 > /dev/null ; then : ; else
++n=`ls -1 $CACHEDIR/*cache-* | wc -l`
++if [ $n != 1 ]; then
+ echo "*** Test failed: $TEST"
+- echo "file properties doesn't point to the new places"
+- echo "Expected result:"
+- cat flist2
+- echo "Actual result:"
+- cat flist1
++ echo "Unexpected cache was created"
++ ls $CACHEDIR
+ exit 1
+ fi
+-rm -rf "$TESTTMPDIR" out1 out2 xxx flist1 flist2 bind-fonts.conf
+
+-dotest "Different directory content between host and sandbox"
++dotest "Keep mtime of the font directory"
+ prep
+-cp "$FONT1" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
++cp $FONT1 $FONTDIR
++touch -d @0 $FONTDIR
++stat $FONTDIR | grep Modify > out1
++$FCCACHE $FONTDIR
++stat $FONTDIR | grep Modify > out2
++if cmp out1 out2 > /dev/null ; then : ; else
++ echo "*** Test failed: $TEST"
++ echo "mtime was modified"
++ exit 1
+ fi
+-$FCCACHE "$FONTDIR"
++
++if [ x"$BWRAP" != "x" ]; then
++dotest "Basic functionality with the bind-mounted cache dir"
++prep
++cp $FONT1 $FONT2 $FONTDIR
++$FCCACHE $FONTDIR
+ sleep 1
+-ls -1 --color=no "$CACHEDIR"/*cache*> out1
+-stat -c '%n %s %y %z' "$(cat out1)" > stat1
+-TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-TESTTMP2DIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-cp "$FONT2" "$TESTTMP2DIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$TESTTMP2DIR"
+-fi
+-sed "s!@FONTDIR@!$TESTTMPDIR/fonts</dir><dir salt="'"'"salt-to-make-different"'"'">$FONTDIR!
+-s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
+-s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind "$TESTTMP2DIR" "$FONTDIR" --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f "%{file}\n" ":foundry=Misc" > xxx
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind "$TESTTMP2DIR" "$FONTDIR" --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" | sort > flist1
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind "$TESTTMP2DIR" "$FONTDIR" --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev find "$TESTTMPDIR"/fonts/ -type f -name '*.pcf' | sort > flist2
+-ls -1 --color=no "$CACHEDIR"/*cache* > out2
+-stat -c '%n %s %y %z' "$(cat out1)" > stat2
+-if cmp stat1 stat2 > /dev/null ; then : ; else
+- echo "*** Test failed: $TEST"
+- echo "cache was created/updated."
+- cat stat1 stat2
+- exit 1
+-fi
+-if grep -v -- "$(cat out1)" out2 > /dev/null ; then : ; else
++ls -l $CACHEDIR > out1
++TESTTMPDIR=`mktemp -d /tmp/fontconfig.XXXXXXXX`
++sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
++s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < $TESTDIR/fonts.conf.in > bind-fonts.conf
++$BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE $TESTTMPDIR/build/test/bind-fonts.conf $TESTTMPDIR/build/fc-match/fc-match$EXEEXT -f "%{file}\n" ":foundry=Misc" > xxx
++$BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE $TESTTMPDIR/build/test/bind-fonts.conf $TESTTMPDIR/build/test/test-bz106618$EXEEXT | sort > flist1
++$BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev find $TESTTMPDIR/fonts/ -type f -name '*.pcf' | sort > flist2
++ls -l $CACHEDIR > out2
++if cmp out1 out2 > /dev/null ; then : ; else
+ echo "*** Test failed: $TEST"
+- echo "cache wasn't created for dir inside sandbox."
+- cat out1 out2
++ echo "cache was updated."
+ exit 1
+ fi
+-if [ x"$(cat xxx)" != "x$TESTTMPDIR/fonts/4x6.pcf" ]; then
++if [ x`cat xxx` != "x$TESTTMPDIR/fonts/4x6.pcf" ]; then
+ echo "*** Test failed: $TEST"
+ echo "file property doesn't point to the new place: $TESTTMPDIR/fonts/4x6.pcf"
+ exit 1
+ fi
+-if cmp flist1 flist2 > /dev/null ; then
++if cmp flist1 flist2 > /dev/null ; then : ; else
+ echo "*** Test failed: $TEST"
+- echo "Missing fonts should be available on sandbox"
++ echo "file properties doesn't point to the new places"
+ echo "Expected result:"
+ cat flist2
+ echo "Actual result:"
+ cat flist1
+ exit 1
+ fi
+-rm -rf "$TESTTMPDIR" "$TESTTMP2DIR" out1 out2 xxx flist1 flist2 stat1 stat2 bind-fonts.conf
+-
+-dotest "Check consistency of MD5 in cache name"
+-prep
+-mkdir -p "$FONTDIR"/sub
+-cp "$FONT1" "$FONTDIR"/sub
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"/sub
+-fi
+-$FCCACHE "$FONTDIR"
+-sleep 1
+-(cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1
+-TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-mkdir -p "$TESTTMPDIR"/cache.dir
+-sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
+-s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
+-s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
+-$BWRAP --bind / / --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-cache/fc-cache"$EXEEXT" "$TESTTMPDIR"/fonts
+-(cd "$TESTTMPDIR"/cache.dir; ls -1 --color=no ./*cache*) > out2
+-if cmp out1 out2 > /dev/null ; then : ; else
+- echo "*** Test failed: $TEST"
+- echo "cache was created unexpectedly."
+- echo "Before:"
+- cat out1
+- echo "After:"
+- cat out2
+- exit 1
+-fi
+-rm -rf "$TESTTMPDIR" out1 out2 bind-fonts.conf
+-
+-dotest "Fallback to uuid"
+-prep
+-cp "$FONT1" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
++rm -rf $TESTTMPDIR out1 out2 xxx flist1 flist2 bind-fonts.conf
+ fi
+-touch -d @"$(stat -c %Y "$FONTDIR")" "$FONTDIR"
+-$FCCACHE "$FONTDIR"
+-sleep 1
+-_cache=$(ls -1 --color=no "$CACHEDIR"/*cache*)
+-_mtime=$(stat -c %Y "$FONTDIR")
+-_uuid=$(uuidgen)
+-_newcache=$(echo "$_cache" | sed "s/\([0-9a-f]*\)\(\-.*\)/$_uuid\2/")
+-mv "$_cache" "$_newcache"
+-echo "$_uuid" > "$FONTDIR"/.uuid
+-touch -d @"$_mtime" "$FONTDIR"
+-(cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1
+-TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-mkdir -p "$TESTTMPDIR"/cache.dir
+-sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
+-s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
+-s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
+-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f ""
+-(cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out2
+-if cmp out1 out2 > /dev/null ; then : ; else
+- echo "*** Test failed: $TEST"
+- echo "cache was created unexpectedly."
+- echo "Before:"
+- cat out1
+- echo "After:"
+- cat out2
+- exit 1
+-fi
+-rm -rf "$TESTTMPDIR" out1 out2 bind-fonts.conf
+-
+-else
+- echo "No bubblewrap installed. skipping..."
+-fi # if [ x"$BWRAP" != "x" -a "x$EXEEXT" = "x" ]
+
+-if [ "x$EXEEXT" = "x" ]; then
+ dotest "sysroot option"
+ prep
+-mkdir -p "$MyPWD"/sysroot/"$FONTDIR"
+-mkdir -p "$MyPWD"/sysroot/"$CACHEDIR"
+-mkdir -p "$MyPWD"/sysroot/"$MyPWD"
+-cp "$FONT1" "$MyPWD"/sysroot/"$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$MyPWD"/sysroot/"$FONTDIR"
+-fi
+-cp "$MyPWD"/fonts.conf "$MyPWD"/sysroot/"$MyPWD"/fonts.conf
+-$FCCACHE -y "$MyPWD"/sysroot
+-
+-dotest "creating cache file on sysroot"
+-md5=$(printf "%s" "$FONTDIR" | md5sum | sed 's/ .*$//')
+-echo "checking for cache file $md5"
+-if ! ls "$MyPWD/sysroot/$CACHEDIR/$md5"*; then
++mkdir -p $MyPWD/sysroot/$FONTDIR
++mkdir -p $MyPWD/sysroot/$CACHEDIR
++cp $FONT1 $MyPWD/sysroot/$FONTDIR
++cp $MyPWD/fonts.conf $MyPWD/sysroot/$MyPWD/fonts.conf
++$FCCACHE -y $MyPWD/sysroot
++stat $MyPWD/sysroot/$FONTDIR/.uuid
++if test $? != 0; then
+ echo "*** Test failed: $TEST"
+- echo "No cache for $FONTDIR ($md5)"
+- ls "$MyPWD"/sysroot/"$CACHEDIR"
+ exit 1
+ fi
+
+-rm -rf "$MyPWD"/sysroot
+-
+-dotest "read newer caches when multiple places are allowed to store"
+-prep
+-cp "$FONT1" "$FONT2" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
++dotest "creating uuid-based cache file on sysroot"
++uuid=`cat $MyPWD/sysroot/$FONTDIR/.uuid`
++ls $MyPWD/sysroot/$CACHEDIR/$uuid*
++if [ $? != 0 ]; then
++ echo "*** Test failed: $TEST"
++ echo "No cache for $uuid"
++ ls $MyPWD/sysroot/$CACHEDIR
++ exit 1
+ fi
+-MYCACHEBASEDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-MYCACHEDIR="$MYCACHEBASEDIR"/cache.dir
+-MYOWNCACHEDIR="$MYCACHEBASEDIR"/owncache.dir
+-MYCONFIG=$(mktemp "$TMPDIR"/fontconfig.XXXXXXXX)
+-
+-mkdir -p "$MYCACHEDIR"
+-mkdir -p "$MYOWNCACHEDIR"
+
+-sed "s!@FONTDIR@!$FONTDIR!
+-s!@REMAPDIR@!!
+-s!@CACHEDIR@!$MYCACHEDIR!" < "$TESTDIR"/fonts.conf.in > my-fonts.conf
+-
+-FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCCACHE "$FONTDIR"
++rm -rf $MyPWD/sysroot
+
++dotest "deleting .uuid file on empty dir"
++prep
++cp $FONT1 $FONT2 $FONTDIR
++$FCCACHE $FONTDIR
+ sleep 1
+-cat<<EOF>"$MYCONFIG"
+-<fontconfig>
+- <match target="scan">
+- <test name="file"><string>$FONTDIR/4x6.pcf</string></test>
+- <edit name="pixelsize"><int>8</int></edit>
+- </match>
+-</fontconfig>
+-EOF
+-sed "s!@FONTDIR@!$FONTDIR!
+-s!@REMAPDIR@!<include ignore_missing=\"yes\">$MYCONFIG</include>!
+-s!@CACHEDIR@!$MYOWNCACHEDIR!" < "$TESTDIR"/fonts.conf.in > my-fonts.conf
+-
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
+- old_epoch=${SOURCE_DATE_EPOCH}
+- SOURCE_DATE_EPOCH=$(("$SOURCE_DATE_EPOCH" + 1))
+-fi
+-FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCCACHE -f "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
+- SOURCE_DATE_EPOCH=${old_epoch}
+-fi
+-
+-sed "s!@FONTDIR@!$FONTDIR!
+-s!@REMAPDIR@!<include ignore_missing=\"yes\">$MYCONFIG</include>!
+-s!@CACHEDIR@!$MYCACHEDIR</cachedir><cachedir>$MYOWNCACHEDIR!" < "$TESTDIR"/fonts.conf.in > my-fonts.conf
+-
+-{
+- FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCLIST - family pixelsize | sort;
+- echo "=";
+- FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCLIST - family pixelsize | sort;
+- echo "=";
+- FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCLIST - family pixelsize | sort;
+-} > my-out
+-tr -d '\015' <my-out >my-out.tmp; mv my-out.tmp my-out
+-sed -e 's/pixelsize=6/pixelsize=8/g' "$BUILDTESTDIR"/"$EXPECTED" > my-out.expected
+-
+-if cmp my-out my-out.expected > /dev/null ; then : ; else
+- echo "*** Test failed: $TEST"
+- echo "*** output is in 'my-out', expected output in 'my-out.expected'"
+- echo "Actual Result"
+- cat my-out
+- echo "Expected Result"
+- cat my-out.expected
+- exit 1
+-fi
+-
+-rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my-fonts.conf my-out my-out.expected
+-
+-fi # if [ "x$EXEEXT" = "x" ]
+-
+-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
+- dotest "MT-safe global config"
+- prep
+- curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
+- (cd "$FONTDIR"; unzip noto.zip)
+- if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
+- fi
+- "$BUILDTESTDIR"/test-crbug1004254
+-else
+- echo "No test-crbug1004254: skipped"
+-fi
+-
+-if [ "x$EXEEXT" = "x" ]; then
+-
+-dotest "empty XDG_CACHE_HOME"
+-prep
+-export XDG_CACHE_HOME=""
+-export old_HOME="$HOME"
+-export temp_HOME=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
+-export HOME="$temp_HOME"
+-cp "$FONT1" "$FONT2" "$FONTDIR"
+-if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
+-fi
+-echo "<fontconfig><dir>$FONTDIR</dir><cachedir prefix=\"xdg\">fontconfig</cachedir></fontconfig>" > my-fonts.conf
+-FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCCACHE "$FONTDIR" || :
+-if [ -d "$HOME"/.cache ] && [ -d "$HOME"/.cache/fontconfig ]; then : ; else
++rm -f $FONTDIR/*pcf
++$FCCACHE $FONTDIR
++rmdir $FONTDIR > /dev/null 2>&1
++if [ $? != 0 ]; then
+ echo "*** Test failed: $TEST"
+- echo "No \$HOME/.cache/fontconfig directory"
+- ls -a "$HOME"
+- ls -a "$HOME"/.cache
++ echo "$FONTDIR isn't empty"
++ ls -al $FONTDIR
+ exit 1
+ fi
+
+-export HOME="$old_HOME"
+-rm -rf "$temp_HOME" my-fonts.conf
+-unset XDG_CACHE_HOME
+-unset old_HOME
+-unset temp_HOME
+-
+-fi # if [ "x$EXEEXT" = "x" ]
+-
+-rm -rf "$FONTDIR" "$CACHEFILE" "$CACHEDIR" "$BASEDIR" "$FONTCONFIG_FILE" out
+-
+-TEST=""
++rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea240..dbd9f579eb72 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,18 +1,18 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.13.1
-revision=3
+version=2.13.96
+revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
-hostmakedepends="gperf pkg-config"
+hostmakedepends="gperf pkg-config python3"
makedepends="expat-devel freetype-devel libuuid-devel"
conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2"
-checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
+distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
+checksum=d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637
pre_build() {
# trick to regenerate hash functions :-)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
` (4 preceding siblings ...)
2022-06-27 15:53 ` zlice
@ 2022-06-27 15:56 ` zlice
2022-06-27 15:56 ` [PR PATCH] [Closed]: " zlice
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-27 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/37670#issuecomment-1167530341
Comment:
closing for https://github.com/void-linux/void-packages/pull/36993 which appears to pass checks
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Closed]: fontconfig: update to 2.13.96.
2022-06-24 12:51 [PR PATCH] fontconfig: update to 2.13.96 zlice
` (5 preceding siblings ...)
2022-06-27 15:56 ` zlice
@ 2022-06-27 15:56 ` zlice
6 siblings, 0 replies; 8+ messages in thread
From: zlice @ 2022-06-27 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
There's a closed pull request on the void-packages repository
fontconfig: update to 2.13.96.
https://github.com/void-linux/void-packages/pull/37670
Description:
#### Testing the changes
- I tested the changes in this PR: **yes**
- I built this PR locally for my native architecture, **x86_64**
#### Comments
Besides being from 2018, there are a few bugs related to `~/.local/share/fonts` causing font rebuilds of some sort in Firefox. This leads to crashes and random windows/menus closing. Updating to this so far seems to have fixed that with minor testing.
^ permalink raw reply [flat|nested] 8+ messages in thread