diff --git a/25-no-bitmap.conf b/25-no-bitmap.conf new file mode 100644 index 0000000..ffa7926 --- /dev/null +++ b/25-no-bitmap.conf @@ -0,0 +1,44 @@ + + + + + + Kochi Mincho + + + false + + + + + Kochi Gothic + + + false + + + + + Sazanami Mincho + + + false + + + + + Sazanami Gothic + + + false + + + + + AR PL ShanHeiSun Uni + + + true + + + diff --git a/fontconfig-required-freetype-version.patch b/fontconfig-required-freetype-version.patch deleted file mode 100644 index 6f7aae3..0000000 --- a/fontconfig-required-freetype-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -pruN fontconfig-2.12.93.orig/configure.ac fontconfig-2.12.93/configure.ac ---- fontconfig-2.12.93.orig/configure.ac 2018-02-15 22:01:54.000000000 +0900 -+++ fontconfig-2.12.93/configure.ac 2018-02-15 22:33:42.353941393 +0900 -@@ -308,8 +308,8 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv, - # Checks for FreeType - # - dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype --PKG_CHECK_MODULES(FREETYPE, freetype2 >= 21.0.15) --PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2 >= 21.0.15" -+PKG_CHECK_MODULES(FREETYPE, freetype2 >= 20.0.14) -+PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2 >= 20.0.14" - - AC_SUBST(FREETYPE_LIBS) - AC_SUBST(FREETYPE_CFLAGS) diff --git a/fontconfig-sleep-less.patch b/fontconfig-sleep-less.patch deleted file mode 100644 index bd9c58c..0000000 --- a/fontconfig-sleep-less.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN fontconfig-2.12.91.orig/fc-cache/fc-cache.c fontconfig-2.12.91/fc-cache/fc-cache.c ---- fontconfig-2.12.91.orig/fc-cache/fc-cache.c 2017-11-20 21:02:20.000000000 +0900 -+++ fontconfig-2.12.91/fc-cache/fc-cache.c 2017-12-14 16:59:19.002003145 +0900 -@@ -413,7 +413,7 @@ main (int argc, char **argv) - */ - /* the resolution of mtime on FAT is 2 seconds */ - if (changed) -- sleep (2); -+ sleep (1); - if (verbose) - printf ("%s: %s\n", argv[0], ret ? _("failed") : _("succeeded")); - return ret; diff --git a/fontconfig.spec b/fontconfig.spec index de7930b..acdece9 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -2,7 +2,7 @@ Name: fontconfig Version: 2.13.1 -Release: 2 +Release: 3 Summary: Fontconfig is a library for configuring and customizing font access License: MIT and Public Domain and UCD URL: http://fontconfig.org @@ -10,10 +10,6 @@ Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2 Source1: 25-no-bitmap-fedora.conf Source2: fc-cache -#PATCH-FIX-https://bugzilla.redhat.com/show_bug.cgi?id=140335 -Patch0: %{name}-sleep-less.patch -Patch1: %{name}-required-freetype-version.patch - BuildRequires: expat-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel BuildRequires: autoconf automake libtool gettext itstool gperf Requires: fontpackages-filesystem freetype >= 2.9.1 grep coreutils glibc font(:lang=en) @@ -121,5 +117,11 @@ HOME=/root /usr/bin/fc-cache -s %{_mandir}/man3/* %changelog +* Thu Jan 9 2020 openEuler Buildteam - 2.13.1-3 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:delete Patches + * Wed Sep 11 2019 openEuler jimmy - 2.13.1-2 - Package init jimmy