Skip to content

V
vlc
Commit f9ac72c8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: update fontconfig to 2.10.2

parent 8dcc49ee
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
contrib/src/fontconfig/SHA512SUMS
View file @ f9ac72c8
a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0 fontconfig-2.8.0.tar.gz d8886b3bb40790591120ae7701efa7430dcb8c171eaa9bac3c42fe62cb0c9646c66aded49a8683a4299e2dbeda90dbf4ca09bb53075f9c089f95097135142cb6 fontconfig-2.10.2.tar.gz
contrib/src/fontconfig/fontconfig-noxml2.patch
View file @ f9ac72c8
...@@ -69,15 +69,15 @@ ...@@ -69,15 +69,15 @@
diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c
--- fontconfig/src/fcxml.c 2009-08-13 16:08:49.000000000 +0200 --- fontconfig/src/fcxml.c 2009-08-13 16:08:49.000000000 +0200
+++ fontconfig.new/src/fcxml.c 2009-08-19 00:03:35.000000000 +0200 +++ fontconfig.new/src/fcxml.c 2009-08-19 00:03:35.000000000 +0200
@@ -2466,13 +2466,18 @@ @@ -2850,6 +2850,7 @@
bail0: bail0:
return ret || !complain; return ret || !complain;
} }
+#endif +#endif
+
FcBool #ifdef _WIN32
FcConfigParseAndLoad (FcConfig *config, pfnGetSystemWindowsDirectory pGetSystemWindowsDirectory = NULL;
@@ -2861,7 +2862,10 @@
const FcChar8 *name, const FcChar8 *name,
FcBool complain) FcBool complain)
{ {
......
contrib/src/fontconfig/rules.mak
View file @ f9ac72c8
# fontconfig # fontconfig
FONTCONFIG_VERSION := 2.8.0 FONTCONFIG_VERSION := 2.10.2
FONTCONFIG_URL := http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz FONTCONFIG_URL := http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
PKGS += fontconfig PKGS += fontconfig
...@@ -15,7 +15,6 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz: ...@@ -15,7 +15,6 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/fontconfig/fontconfig-march.patch
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch $(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch
$(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch $(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment