Update freetype since security issues are present in 2.3.5.

Remove unneeded patch applied upstream.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index fc3e434661f378a3de66793db6069865df852b68..1cbb348088feb0abbc768f42a7f7b324991e0296 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -498,7 +498,6 @@ freetype-$(FREETYPE2_VERSION).tar.gz:
 
 freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/freetype-cross.patch
 
 .freetype: freetype2
 ifdef HAVE_CYGWIN

diff --git a/extras/contrib/src/Patches/freetype-cross.patch b/extras/contrib/src/Patches/freetype-cross.patch
deleted file mode 100644 (file)
index fd1d75f..0000000
--- a/extras/contrib/src/Patches/freetype-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- freetype2/builds/unix/configure    Tue Jul  3 07:41:45 2007
-+++ freetype2/builds/unix/configure.new        Mon Sep 24 10:42:30 2007
-***************
-*** 3269,3277 ****
-    IFS=$as_save_IFS
-    test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--     ac_cv_prog_CC_BUILD="${build-gcc}"
-      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-      break 2
-    fi
-  done
---- 3269,3277 ----
-    IFS=$as_save_IFS
-    test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+     ac_cv_prog_CC_BUILD="${build}-gcc"
-      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-      break 2
-    fi
-  done

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 692ee63d66a7394ddb33a250dc60a99050658d6f..66ab55faffd154d9bd67d8c28a89ce7d7b802345 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -55,7 +55,7 @@ GETTEXT_VERSION=0.17
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 FONTCONFIG_VERSION=2.4.2
 FONTCONFIG_URL=http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
-FREETYPE2_VERSION=2.3.5
+FREETYPE2_VERSION=2.3.6
 FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
 FRIBIDI_VERSION=0.19.1
 FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz