Mercurial > mxe-octave

changeset 2662:8aa95959e3d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package fontconfig
author Mark Brand <mabrand@mabrand.nl>
date Tue, 17 Jul 2012 09:50:31 +0200
parents 9aa687683a32
children 848bc901b232
files index.html src/fontconfig-1-fixes.patch src/fontconfig.mk
diffstat 3 files changed, 2 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Wed Jul 11 21:25:16 2012 +0200
+++ b/index.html	Tue Jul 17 09:50:31 2012 +0200
@@ -1065,7 +1065,7 @@
     </tr>
     <tr>
         <td id="fontconfig-package">fontconfig</td>
-        <td id="fontconfig-version">2.9.0</td>
+        <td id="fontconfig-version">2.10.0</td>
         <td id="fontconfig-website"><a href="http://fontconfig.org/">fontconfig</a></td>
     </tr>
     <tr>
--- a/src/fontconfig-1-fixes.patch	Wed Jul 11 21:25:16 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-From 107e1934711cd9246c03f01e0acecdede714ea73 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 14 Jun 2012 11:27:31 +0900
-Subject: [PATCH] Fix the fail of make install with --disable-shared on Win32
- (cherry picked from commit
- 997a64a67b77ae7c083f4a2898670201ed618fb2)
-
----
- configure.in    |    1 +
- src/Makefile.am |    2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index da6ef95..88b6367 100644
---- a/configure.in
-+++ b/configure.in
-@@ -94,6 +94,7 @@ AC_SUBST(WARN_CFLAGS)
- dnl ==========================================================================
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-+AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes")
- 
- dnl ==========================================================================
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a7bb73c..81562cb 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -132,9 +132,11 @@ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT
- 
- libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
- 
-+if ENABLE_SHARED
- install-data-local: install-ms-import-lib install-libtool-import-lib
- 
- uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
-+endif
- 
- PUBLIC_FILES = \
- 	$(top_srcdir)/fontconfig/fontconfig.h \
--- 
-1.7.10.4
-
--- a/src/fontconfig.mk	Wed Jul 11 21:25:16 2012 +0200
+++ b/src/fontconfig.mk	Tue Jul 17 09:50:31 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := fontconfig
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 1ab2f437c2261028ae7969892277af2d8d8db489
+$(PKG)_CHECKSUM := d47c6fa5693f91e274d655b5644dd333716c1395
 $(PKG)_SUBDIR   := fontconfig-$($(PKG)_VERSION)
 $(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://fontconfig.org/release/$($(PKG)_FILE)
@@ -16,18 +16,12 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && aclocal
-    cd '$(1)' && autoheader
-    cd '$(1)' && libtoolize
-    cd '$(1)' && automake
-    cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-arch='$(TARGET)' \
-        --with-freetype-config='$(PREFIX)/$(TARGET)/bin/freetype-config' \
         --with-expat='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=