$ git show --format=fuller --patch-with-stat --summary e5c536d35699b3ceb1784bc646dd69a4aff12703
commit e5c536d35699b3ceb1784bc646dd69a4aff12703
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Tue Sep 27 02:17:53 2022 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Tue Sep 27 02:17:53 2022 +0200
2.14.0
---
.abf.yml | 2 +-
fontconfig-2.11.95-wine-assert-nonfatal.patch | 11 +--
...g-2.13.0-old-diff-gz-06-ubuntu-lcddefault.patch | 49 +++++-------
fontconfig-omdv-config.patch | 80 +++++--------------
fontconfig-stop-cleanup-uuid.patch | 93 ----------------------
fontconfig.spec | 7 +-
6 files changed, 49 insertions(+), 193 deletions(-)
delete mode 100644 fontconfig-stop-cleanup-uuid.patch
diff --git a/.abf.yml b/.abf.yml
index db54344..6df7a01 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- fontconfig-2.13.1.tar.bz2: 75612356ef4f801735b49baf987f8942b4a7a5e1
+ fontconfig-2.14.0.tar.xz: 9b1d4c5a61b4d25140db444e9cf56f09fb843fce
diff --git a/fontconfig-2.11.95-wine-assert-nonfatal.patch b/fontconfig-2.11.95-wine-assert-nonfatal.patch
index f831187..d490e38 100644
--- a/fontconfig-2.11.95-wine-assert-nonfatal.patch
+++ b/fontconfig-2.11.95-wine-assert-nonfatal.patch
@@ -1,12 +1,13 @@
---- fontconfig-2.11.95/src/fcweight.c.omv~ 2016-06-03 23:22:39.335138695 +0200
-+++ fontconfig-2.11.95/src/fcweight.c 2016-06-03 23:24:28.284082974 +0200
-@@ -45,7 +45,8 @@ static int lerp(int x, int x1, int x2, i
+diff -up fontconfig-2.14.0/src/fcweight.c.3~ fontconfig-2.14.0/src/fcweight.c
+--- fontconfig-2.14.0/src/fcweight.c.3~ 2022-09-27 02:11:48.937204365 +0200
++++ fontconfig-2.14.0/src/fcweight.c 2022-09-27 02:12:41.533539573 +0200
+@@ -45,7 +45,8 @@ static double lerp(double x, int x1, int
{
int dx = x2 - x1;
int dy = y2 - y1;
- assert (dx > 0 && dy >= 0 && x1 <= x && x <= x2);
-+ if (!(dx > 0 && dy >= 0 && x1 <= x && x <= x2))
++ if (! (dx > 0 && dy >= 0 && x1 <= x && x <= x2) )
+ fprintf(stderr, "lerp called with bad parameters %d,%d,%d,%d,%d,%d\n", x, x1, x2, y1, y2);
- return y1 + (dy*(x-x1) + dx/2) / dx;
+ return y1 + (x-x1) * dy / dx;
}
diff --git a/fontconfig-2.13.0-old-diff-gz-06-ubuntu-lcddefault.patch b/fontconfig-2.13.0-old-diff-gz-06-ubuntu-lcddefault.patch
index 17ef781..f5c26ef 100644
--- a/fontconfig-2.13.0-old-diff-gz-06-ubuntu-lcddefault.patch
+++ b/fontconfig-2.13.0-old-diff-gz-06-ubuntu-lcddefault.patch
@@ -1,7 +1,7 @@
-diff -ur fontconfig-2.13.0/conf.d/Makefile.am fontconfig-2.13.0_patched/conf.d/Makefile.am
---- fontconfig-2.13.0/conf.d/Makefile.am 2017-10-12 12:03:39.000000000 +0300
-+++ fontconfig-2.13.0_patched/conf.d/Makefile.am 2018-09-11 16:58:01.001861533 +0300
-@@ -26,8 +26,11 @@
+diff -up fontconfig-2.14.0/conf.d/Makefile.am.6~ fontconfig-2.14.0/conf.d/Makefile.am
+--- fontconfig-2.14.0/conf.d/Makefile.am.6~ 2022-09-27 02:12:58.101645315 +0200
++++ fontconfig-2.14.0/conf.d/Makefile.am 2022-09-27 02:14:38.715289024 +0200
+@@ -30,6 +30,8 @@ DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)
CONF_LINKS = \
@@ -9,55 +9,48 @@ diff -ur fontconfig-2.13.0/conf.d/Makefile.am fontconfig-2.13.0_patched/conf.d/M
+ 10-hinting.conf \
10-hinting-$(PREFERRED_HINTING).conf \
10-scale-bitmap-fonts.conf \
-+ 11-lcdfilter-default.conf \
- 20-unhint-small-vera.conf \
- 30-metric-aliases.conf \
- 40-nonlatin.conf \
-@@ -52,7 +55,9 @@
-
- templatedir = $(TEMPLATEDIR)
+ 11-lcdfilter-default.conf \
+@@ -60,7 +62,9 @@ templatedir = $(TEMPLATEDIR)
template_DATA = \
+ 05-reset-dirs-sample.conf \
+ 09-autohint-if-no-hinting.conf \
+ 10-antialias.conf \
10-autohint.conf \
+ 10-hinting.conf \
10-hinting-full.conf \
10-hinting-medium.conf \
10-hinting-none.conf \
-@@ -75,6 +80,7 @@
- 45-latin.conf \
+@@ -86,6 +90,7 @@ template_DATA = \
49-sansserif.conf \
50-user.conf \
-+ 53-monospace-lcd-filter.conf \
51-local.conf \
++ 53-monospace-lcd-filter.conf \
60-generic.conf \
60-latin.conf \
-diff -ur fontconfig-2.13.0/conf.d/Makefile.in fontconfig-2.13.0_patched/conf.d/Makefile.in
---- fontconfig-2.13.0/conf.d/Makefile.in 2018-03-06 06:31:57.000000000 +0300
-+++ fontconfig-2.13.0_patched/conf.d/Makefile.in 2018-09-11 16:59:47.311858753 +0300
-@@ -368,8 +368,11 @@
+ 65-fonts-persian.conf \
+diff -up fontconfig-2.14.0/conf.d/Makefile.in.6~ fontconfig-2.14.0/conf.d/Makefile.in
+--- fontconfig-2.14.0/conf.d/Makefile.in.6~ 2022-03-31 09:41:24.000000000 +0200
++++ fontconfig-2.14.0/conf.d/Makefile.in 2022-09-27 02:15:26.411595004 +0200
+@@ -386,6 +386,8 @@ BUILT_SOURCES = \
DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)
CONF_LINKS = \
-- 10-hinting-$(PREFERRED_HINTING).conf \
+ 10-antialias.conf \
+ 10-hinting.conf \
-+ 10-hinting-$(PREFERRED_HINTING).conf \
+ 10-hinting-$(PREFERRED_HINTING).conf \
10-scale-bitmap-fonts.conf \
-+ 11-lcdfilter-default.conf \
- 20-unhint-small-vera.conf \
- 30-metric-aliases.conf \
- 40-nonlatin.conf \
-@@ -392,7 +395,9 @@
- config_DATA = $(DOC_FILES)
- templatedir = $(TEMPLATEDIR)
+ 11-lcdfilter-default.conf \
+@@ -414,7 +416,9 @@ templatedir = $(TEMPLATEDIR)
template_DATA = \
+ 05-reset-dirs-sample.conf \
+ 09-autohint-if-no-hinting.conf \
+ 10-antialias.conf \
10-autohint.conf \
+ 10-hinting.conf \
10-hinting-full.conf \
10-hinting-medium.conf \
10-hinting-none.conf \
-@@ -416,6 +421,7 @@
+@@ -440,6 +444,7 @@ template_DATA = \
49-sansserif.conf \
50-user.conf \
51-local.conf \
diff --git a/fontconfig-omdv-config.patch b/fontconfig-omdv-config.patch
index 4679273..b3a3769 100644
--- a/fontconfig-omdv-config.patch
+++ b/fontconfig-omdv-config.patch
@@ -1,6 +1,7 @@
---- fontconfig-2.12.6/conf.d/45-latin.conf.0001~ 2016-12-02 04:22:19.000000000 +0100
-+++ fontconfig-2.12.6/conf.d/45-latin.conf 2017-10-18 17:40:56.294244729 +0200
-@@ -58,6 +58,10 @@
+diff -up fontconfig-2.14.0/conf.d/45-latin.conf.2~ fontconfig-2.14.0/conf.d/45-latin.conf
+--- fontconfig-2.14.0/conf.d/45-latin.conf.2~ 2020-12-03 12:45:00.000000000 +0100
++++ fontconfig-2.14.0/conf.d/45-latin.conf 2022-09-27 02:09:32.093336510 +0200
+@@ -59,6 +59,10 @@
<default><family>serif</family></default>
</alias>
<alias>
@@ -11,7 +12,7 @@
<family>Palatino Linotype</family>
<default><family>serif</family></default>
</alias>
-@@ -70,6 +74,10 @@
+@@ -71,6 +75,10 @@
<default><family>serif</family></default>
</alias>
<alias>
@@ -22,7 +23,7 @@
<family>Times New Roman</family>
<default><family>serif</family></default>
</alias>
-@@ -149,6 +157,10 @@
+@@ -150,6 +158,10 @@
<default><family>sans-serif</family></default>
</alias>
<alias>
@@ -33,7 +34,7 @@
<family>Luxi Sans</family>
<default><family>sans-serif</family></default>
</alias>
-@@ -232,6 +244,14 @@
+@@ -237,6 +249,14 @@
<default><family>monospace</family></default>
</alias>
<alias>
@@ -48,66 +49,21 @@
<family>Terminal</family>
<default><family>monospace</family></default>
</alias>
---- fontconfig-2.12.6/conf.d/60-latin.conf.0001~ 2016-12-02 04:22:19.000000000 +0100
-+++ fontconfig-2.12.6/conf.d/60-latin.conf 2017-10-18 17:40:56.295244727 +0200
-@@ -4,8 +4,9 @@
- <alias>
- <family>serif</family>
- <prefer>
-- <family>Bitstream Vera Serif</family>
-+ <family>Noto Serif</family>
- <family>DejaVu Serif</family>
-+ <family>Bitstream Vera Serif</family>
- <family>Times New Roman</family>
- <family>Thorndale AMT</family>
- <family>Luxi Serif</family>
-@@ -17,15 +18,16 @@
- <alias>
- <family>sans-serif</family>
- <prefer>
-- <family>Bitstream Vera Sans</family>
-+ <family>Noto Sans</family>
- <family>DejaVu Sans</family>
-- <family>Verdana</family>
-- <family>Arial</family>
-- <family>Albany AMT</family>
-+ <family>Bitstream Vera Sans</family>
- <family>Luxi Sans</family>
- <family>Nimbus Sans L</family>
- <family>Nimbus Sans</family>
-+ <family>Arial</family>
-+ <family>Albany AMT</family>
- <family>Helvetica</family>
-+ <family>Verdana</family>
- <family>Lucida Sans Unicode</family>
- <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
- <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-@@ -34,16 +36,18 @@
- <alias>
+diff -up fontconfig-2.14.0/conf.d/60-latin.conf.2~ fontconfig-2.14.0/conf.d/60-latin.conf
+--- fontconfig-2.14.0/conf.d/60-latin.conf.2~ 2022-09-27 02:09:32.093336510 +0200
++++ fontconfig-2.14.0/conf.d/60-latin.conf 2022-09-27 02:11:29.054077867 +0200
+@@ -36,6 +36,7 @@
<family>monospace</family>
<prefer>
-- <family>Bitstream Vera Sans Mono</family>
+ <family>Noto Sans Mono</family>
+ <family>Noto Mono</family>
-+ <family>Noto Sans Mono CJK SC</family>
<family>DejaVu Sans Mono</family>
-+ <family>Bitstream Vera 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>Andale Mono</family>
-+ <family>Courier New</family>
-+ <family>Cumberland AMT</family>
- <family>Courier</family>
- </prefer>
- </alias>
---- fontconfig-2.12.6/conf.d/65-nonlatin.conf.0001~ 2017-09-21 06:44:27.000000000 +0200
-+++ fontconfig-2.12.6/conf.d/65-nonlatin.conf 2017-10-18 17:42:21.831088808 +0200
-@@ -23,13 +23,25 @@
+ <family>Andale Mono</family>
+diff -up fontconfig-2.14.0/conf.d/65-nonlatin.conf.2~ fontconfig-2.14.0/conf.d/65-nonlatin.conf
+--- fontconfig-2.14.0/conf.d/65-nonlatin.conf.2~ 2020-12-03 12:45:00.000000000 +0100
++++ fontconfig-2.14.0/conf.d/65-nonlatin.conf 2022-09-27 02:09:32.094336516 +0200
+@@ -24,13 +24,25 @@
<family>Sampige</family> <!-- kannada -->
<family>padmaa</family> <!-- gujarati -->
<family>Hapax Berbère</family> <!-- tifinagh -->
@@ -133,7 +89,7 @@
<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
<family>MgOpen Canonica</family>
-@@ -150,12 +162,18 @@
+@@ -151,12 +163,18 @@
<family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
<family>AR PL KaitiM GB</family>
diff --git a/fontconfig-stop-cleanup-uuid.patch b/fontconfig-stop-cleanup-uuid.patch
deleted file mode 100644
index 9972cd2..0000000
--- a/fontconfig-stop-cleanup-uuid.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 5f12f564f8748deaa603adb7a4b8f616b6390ad4 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 17 Oct 2018 21:15:47 -0700
-Subject: [PATCH 1/2] Do not remove UUID file when a scanned directory is empty
-
-Because FcDirCacheDeleteUUID does not reset the modification time on
-the directory, and because FcDirCacheRead unconditionally creates the
-UUID file each time it is run, any empty directory in the cache will
-get its timestamp changed each time the cache for that directory is
-read.
-
-Instead, just leave the UUID file around as it is harmless.
-
-The alternative would be to only create the UUID file after the cache
-has been created and the directory has been discovered to be
-non-empty, but that would delay the creation of the UUID file.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
- src/fcdir.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/fcdir.c b/src/fcdir.c
-index 93f220c..bfcdf95 100644
---- a/src/fcdir.c
-+++ b/src/fcdir.c
-@@ -421,13 +421,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
- /* Not using existing cache file, construct new cache */
- if (!cache)
- cache = FcDirCacheScan (dir, config);
-- if (cache)
-- {
-- FcFontSet *fs = FcCacheSet (cache);
--
-- if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
-- FcDirCacheDeleteUUID (dir, config);
-- }
-
- return cache;
- }
---
-2.19.1
-
-From e9113a764a1001165711022aceb45aa2765feb8b Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 25 Oct 2018 07:16:32 +0000
-Subject: [PATCH 2/2] Do not run a test case for .uuid deletion
-
----
- test/run-test.sh | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/test/run-test.sh b/test/run-test.sh
-index e76e39b..ed41456 100644
---- a/test/run-test.sh
-+++ b/test/run-test.sh
-@@ -239,19 +239,19 @@ fi
-
- rm -rf $MyPWD/sysroot
-
--dotest "deleting .uuid file on empty dir"
--prep
--cp $FONT1 $FONT2 $FONTDIR
--$FCCACHE $FONTDIR
--sleep 1
--rm -f $FONTDIR/*pcf
--$FCCACHE $FONTDIR
--rmdir $FONTDIR > /dev/null 2>&1
--if [ $? != 0 ]; then
-- echo "*** Test failed: $TEST"
-- echo "$FONTDIR isn't empty"
-- ls -al $FONTDIR
-- exit 1
--fi
-+# dotest "deleting .uuid file on empty dir"
-+# prep
-+# cp $FONT1 $FONT2 $FONTDIR
-+# $FCCACHE $FONTDIR
-+# sleep 1
-+# rm -f $FONTDIR/*pcf
-+# $FCCACHE $FONTDIR
-+# rmdir $FONTDIR > /dev/null 2>&1
-+# if [ $? != 0 ]; then
-+# echo "*** Test failed: $TEST"
-+# echo "$FONTDIR isn't empty"
-+# ls -al $FONTDIR
-+# exit 1
-+# fi
-
- rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
---
-2.19.1
-
diff --git a/fontconfig.spec b/fontconfig.spec
index 982f9ac..8814928 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -15,12 +15,12 @@
Summary: Font configuration library
Name: fontconfig
-Version: 2.13.1
-Release: 8
+Version: 2.14.0
+Release: 1
License: MIT
Group: System/X11
Url: http://fontconfig.org/
-Source0: http://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.bz2
+Source0: http://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.xz
# (fc) 2.3.2-3mdk prefer urw fonts
Source1: 30-mdv-urwfonts.conf
# (fc) 2.3.2-3mdk disable antialiasing for some fonts
@@ -35,7 +35,6 @@ Source8: 26-mdv-no-embeddedbitmap.conf
Source10: 25-no-bitmap-fedora.conf
Patch0: https://src.fedoraproject.org/cgit/rpms/fontconfig.git/plain/fontconfig-sleep-less.patch
-Patch1: https://src.fedoraproject.org/cgit/rpms/fontconfig.git/plain/fontconfig-stop-cleanup-uuid.patch
Patch2: fontconfig-omdv-config.patch
Patch3: fontconfig-2.11.95-wine-assert-nonfatal.patch