[vlc-devel] [vlc-commits] Contribs: update fontconfig to 2.10.2

[Rafaël Carré]

Hi,

On 03/10/13 12:42, Jean-Baptiste Kempf wrote:
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 10 12:41:53 2013 +0100| [f9ac72c893dce40875b65bbaa15a6b5765636ae4] | committer: Jean-Baptiste Kempf
> 
> Contribs: update fontconfig to 2.10.2
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f9ac72c893dce40875b65bbaa15a6b5765636ae4
> ---
> 
>  contrib/src/fontconfig/SHA512SUMS              |    2 +-
>  contrib/src/fontconfig/fontconfig-noxml2.patch |    8 ++++----
>  contrib/src/fontconfig/rules.mak               |    3 +--
>  3 files changed, 6 insertions(+), 7 deletions(-)
> 

> diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak
> index 59b5717..576322c 100644
> --- a/contrib/src/fontconfig/rules.mak
> +++ b/contrib/src/fontconfig/rules.mak
> @@ -15,7 +15,6 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
>  
>  fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
>  	$(UNPACK)
> -	$(APPLY) $(SRC)/fontconfig/fontconfig-march.patch

You forgot to remove the patch itself

>  ifdef HAVE_WIN32
>  	$(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch
>  	$(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch