New upstream release.
This commit is contained in:
Akira TAGOH
parent
65fe527585
commit
cd60c58359
1
.gitignore
vendored
1
.gitignore
vendored
@ -30,3 +30,4 @@ fontconfig-2.8.0.tar.gz
|
||||
/fontconfig-2.12.93.tar.bz2
|
||||
/fontconfig-2.13.0.tar.bz2
|
||||
/fontconfig-2.13.1.tar.bz2
|
||||
/fontconfig-2.13.91.tar.xz
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
diff -pruN fontconfig-2.13.1.orig/test/test-bz106632.c fontconfig-2.13.1/test/test-bz106632.c
|
||||
--- fontconfig-2.13.1.orig/test/test-bz106632.c 2018-08-29 09:55:14.000000000 +0000
|
||||
+++ fontconfig-2.13.1/test/test-bz106632.c 2018-11-13 11:57:37.822142424 +0000
|
||||
@@ -197,7 +197,7 @@ main (void)
|
||||
mkdir_p (cachedir);
|
||||
|
||||
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
|
||||
- snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
|
||||
+ snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir);
|
||||
system (cmd);
|
||||
|
||||
fprintf (stderr, "D: Loading a config\n");
|
||||
@@ -226,15 +226,21 @@ main (void)
|
||||
goto bail;
|
||||
}
|
||||
fprintf (stderr, "D: Removing %s\n", fontdir);
|
||||
- snprintf (cmd, 512, "rm -f %s%s*", fontdir, FC_DIR_SEPARATOR_S);
|
||||
+ snprintf (cmd, 512, "sleep 1; rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S);
|
||||
system (cmd);
|
||||
fprintf (stderr, "D: Reinitializing\n");
|
||||
- if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
|
||||
+ if (FcConfigUptoDate (config))
|
||||
{
|
||||
- fprintf (stderr, "E: Unable to reinitialize\n");
|
||||
+ fprintf (stderr, "E: Config reports up-to-date\n");
|
||||
ret = 2;
|
||||
goto bail;
|
||||
}
|
||||
+ if (!FcInitReinitialize ())
|
||||
+ {
|
||||
+ fprintf (stderr, "E: Unable to reinitialize\n");
|
||||
+ ret = 3;
|
||||
+ goto bail;
|
||||
+ }
|
||||
if (FcConfigGetCurrent () == config)
|
||||
{
|
||||
fprintf (stderr, "E: config wasn't reloaded\n");
|
||||
@@ -265,10 +271,16 @@ main (void)
|
||||
goto bail;
|
||||
}
|
||||
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
|
||||
- snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
|
||||
+ snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir);
|
||||
system (cmd);
|
||||
fprintf (stderr, "D: Reinitializing\n");
|
||||
- if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
|
||||
+ if (FcConfigUptoDate (config))
|
||||
+ {
|
||||
+ fprintf (stderr, "E: Config up-to-date after addition\n");
|
||||
+ ret = 3;
|
||||
+ goto bail;
|
||||
+ }
|
||||
+ if (!FcInitReinitialize ())
|
||||
{
|
||||
fprintf (stderr, "E: Unable to reinitialize\n");
|
||||
ret = 2;
|
||||
@ -1,26 +0,0 @@
|
||||
From 13b4ba91353a4ead4623d0133f6eb0283e91b15a Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Tue, 13 Nov 2018 06:34:11 +0000
|
||||
Subject: [PATCH] Use Rachana instead of Meera for Malayalam
|
||||
|
||||
Meera is a sans-serif font for Malayalam. that should be substituted for serif.
|
||||
---
|
||||
conf.d/65-nonlatin.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
|
||||
index 54fb974f..1b9de316 100644
|
||||
--- a/conf.d/65-nonlatin.conf
|
||||
+++ b/conf.d/65-nonlatin.conf
|
||||
@@ -63,7 +63,7 @@
|
||||
<family>Lohit Sindhi</family>
|
||||
<family>Lohit Punjabi</family>
|
||||
<family>Lohit Tamil</family>
|
||||
- <family>Meera</family>
|
||||
+ <family>Rachana</family>
|
||||
<family>Lohit Malayalam</family>
|
||||
<family>Lohit Kannada</family>
|
||||
<family>Lohit Telugu</family>
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
Summary: Font configuration and customization library
|
||||
Name: fontconfig
|
||||
Version: 2.13.1
|
||||
Release: 6%{?dist}
|
||||
Version: 2.13.91
|
||||
Release: 1%{?dist}
|
||||
# src/ftglue.[ch] is in Public Domain
|
||||
# src/fccache.c contains Public Domain code
|
||||
# fc-case/CaseFolding.txt is in the UCD
|
||||
@ -19,9 +19,6 @@ Source2: fc-cache
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
||||
Patch0: %{name}-sleep-less.patch
|
||||
Patch1: %{name}-required-freetype-version.patch
|
||||
Patch2: %{name}-stop-cleanup-uuid.patch
|
||||
Patch3: %{name}-use-rachana.patch
|
||||
Patch4: %{name}-test-delay.patch
|
||||
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: freetype-devel >= %{freetype_version}
|
||||
@ -35,7 +32,7 @@ Requires(pre): freetype >= 2.9.1-6
|
||||
Requires(post): grep coreutils
|
||||
Requires(postun): /sbin/ldconfig
|
||||
Requires: font(:lang=en)
|
||||
Suggests: dejavu-sans-fonts
|
||||
Suggests: font(dejavusans)
|
||||
|
||||
%description
|
||||
Fontconfig is designed to locate fonts within the
|
||||
@ -168,6 +165,9 @@ HOME=/root /usr/bin/fc-cache -s
|
||||
%doc fontconfig-devel.txt fontconfig-devel
|
||||
|
||||
%changelog
|
||||
* Mon Jun 10 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.91-1
|
||||
- New upstream release.
|
||||
|
||||
* Fri Feb 22 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.1-6
|
||||
- Update freetype version for runtime dependency to ensure
|
||||
they have FT_Done_MM_Var symbol certainly. (#1679619)
|
||||
|
||||
1
sources
1
sources
@ -1 +1,2 @@
|
||||
SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
|
||||
SHA512 (fontconfig-2.13.91.tar.xz) = 2d7f749883dd0e1b393dc03698d06dc4431ecf2f06da1928e9d9ea4a878fd11ff4a8f5d86143c5df14460c04938105a1e80d501ac680790dad857d1f0d0f51ae
|
||||
|
||||
Loading…
Reference in New Issue
Block a user