packages/fontconfig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1 delete patches

Browse Source 
Merge pull request !1 from 通行百万/local
This commit is contained in:
openeuler-ci-bot 2020-01-09 21:15:20 +08:00 committed by Gitee
commit a995033b65
4 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
25-no-bitmap.conf Normal file
View 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>

14
fontconfig-required-freetype-version.patch
View File

@ -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)

12
fontconfig-sleep-less.patch
View File

@ -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;

12
fontconfig.spec
View File

@ -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 <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
- Package init jimmy