delete patches
This commit is contained in:
parent
8952c6704c
commit
63f9f3fe20
44
25-no-bitmap.conf
Normal file
44
25-no-bitmap.conf
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||||
|
<fontconfig>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Kochi Mincho</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Kochi Gothic</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Sazanami Mincho</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Sazanami Gothic</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>AR PL ShanHeiSun Uni</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>true</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
</fontconfig>
|
||||||
@ -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)
|
|
||||||
@ -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;
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: fontconfig
|
Name: fontconfig
|
||||||
Version: 2.13.1
|
Version: 2.13.1
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Fontconfig is a library for configuring and customizing font access
|
Summary: Fontconfig is a library for configuring and customizing font access
|
||||||
License: MIT and Public Domain and UCD
|
License: MIT and Public Domain and UCD
|
||||||
URL: http://fontconfig.org
|
URL: http://fontconfig.org
|
||||||
@ -10,10 +10,6 @@ Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
|
|||||||
Source1: 25-no-bitmap-fedora.conf
|
Source1: 25-no-bitmap-fedora.conf
|
||||||
Source2: fc-cache
|
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: expat-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
|
||||||
BuildRequires: autoconf automake libtool gettext itstool gperf
|
BuildRequires: autoconf automake libtool gettext itstool gperf
|
||||||
Requires: fontpackages-filesystem freetype >= 2.9.1 grep coreutils glibc font(:lang=en)
|
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/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.13.1-3
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:delete Patches
|
||||||
|
|
||||||
* Wed Sep 11 2019 openEuler jimmy<dukaitian@huawei.com> - 2.13.1-2
|
* Wed Sep 11 2019 openEuler jimmy<dukaitian@huawei.com> - 2.13.1-2
|
||||||
- Package init jimmy
|
- Package init jimmy
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user