Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/fontconfig.git#a7c1f3c46b84fea1c68387200b2d237da7460e84
This commit is contained in:
DistroBaker
parent
173e1c897e
commit
e5cb545d3e
|
|
@ -32,3 +32,4 @@ fontconfig-2.8.0.tar.gz
|
|||
/fontconfig-2.13.1.tar.bz2
|
||||
/fontconfig-2.13.91.tar.xz
|
||||
/fontconfig-2.13.92.tar.xz
|
||||
/fontconfig-2.13.93.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
diff -pruN fontconfig-2.13.93.orig/test/run-test.sh fontconfig-2.13.93/test/run-test.sh
|
||||
--- fontconfig-2.13.93.orig/test/run-test.sh 2020-11-28 10:56:42.000000000 +0900
|
||||
+++ fontconfig-2.13.93/test/run-test.sh 2020-11-28 12:39:57.345644527 +0900
|
||||
@@ -421,18 +421,18 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my-
|
||||
|
||||
fi # if [ "x$EXEEXT" = "x" ]
|
||||
|
||||
-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
|
||||
- dotest "MT-safe global config"
|
||||
- prep
|
||||
- curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
|
||||
- (cd "$FONTDIR"; unzip noto.zip)
|
||||
- if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
|
||||
- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
|
||||
- fi
|
||||
- "$BUILDTESTDIR"/test-crbug1004254
|
||||
-else
|
||||
+#if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
|
||||
+# dotest "MT-safe global config"
|
||||
+# prep
|
||||
+# curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
|
||||
+# (cd "$FONTDIR"; unzip noto.zip)
|
||||
+# if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
|
||||
+# touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
|
||||
+# fi
|
||||
+# "$BUILDTESTDIR"/test-crbug1004254
|
||||
+#else
|
||||
echo "No test-crbug1004254: skipped"
|
||||
-fi
|
||||
+#fi
|
||||
|
||||
if [ "x$EXEEXT" = "x" ]; then
|
||||
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
Summary: Font configuration and customization library
|
||||
Name: fontconfig
|
||||
Version: 2.13.92
|
||||
Release: 12%{?dist}
|
||||
Version: 2.13.93
|
||||
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
|
||||
|
|
@ -15,28 +15,18 @@ Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz
|
|||
URL: http://fontconfig.org
|
||||
Source1: 25-no-bitmap-fedora.conf
|
||||
Source2: fc-cache
|
||||
Source3: FcConfigGetFilename.3
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
||||
Patch0: %{name}-sleep-less.patch
|
||||
Patch1: %{name}-required-freetype-version.patch
|
||||
Patch2: %{name}-score-hint-on-match.patch
|
||||
Patch3: %{name}-fix-1744377.patch
|
||||
Patch4: %{name}-drop-lang-from-pkgkit-format.patch
|
||||
Patch5: %{name}-sysroot.patch
|
||||
Patch6: %{name}-read-latest-cache.patch
|
||||
Patch7: %{name}-mt.patch
|
||||
Patch8: %{name}-fix-test.patch
|
||||
Patch9: %{name}-fix-assertion.patch
|
||||
Patch10: %{name}-fix-dtd.patch
|
||||
Patch11: %{name}-fix-dtd-id.patch
|
||||
Patch12: %{name}-0-timestamp-dir-on-sb.patch
|
||||
Patch5: %{name}-disable-network-required-test.patch
|
||||
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: freetype-devel >= %{freetype_version}
|
||||
BuildRequires: fontpackages-devel
|
||||
BuildRequires: autoconf automake libtool gettext
|
||||
BuildRequires: gperf
|
||||
BuildRequires: docbook-utils docbook-utils-pdf
|
||||
|
||||
Requires: fonts-filesystem freetype
|
||||
# Register DTD system-wide to make validation work by default
|
||||
|
|
@ -78,12 +68,8 @@ which is useful for developing applications that uses fontconfig.
|
|||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{version}/doc
|
||||
|
||||
%build
|
||||
# We don't want to rebuild the docs, but we want to install the included ones.
|
||||
export HASDOCBOOK=no
|
||||
|
||||
autoreconf
|
||||
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
|
||||
--enable-libxml2 \
|
||||
|
|
@ -190,6 +176,9 @@ fi
|
|||
%doc fontconfig-devel.txt fontconfig-devel
|
||||
|
||||
%changelog
|
||||
* Sat Nov 28 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-1
|
||||
- New upstream release.
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.92-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (fontconfig-2.13.92.tar.xz) = 3c8c75ac51cb45531aa02654ce6e32e6db2650679531d2c84df00dd38425c27344599484b2625983ec55b1ba7bab3be8464d7eb75286ea3a0e97a361d2ae91d4
|
||||
SHA512 (fontconfig-2.13.93.tar.xz) = 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
|
||||
|
|
|
|||
Loading…
Reference in New Issue