update package fontconfig

This commit is contained in:
Mark Brand 2012-07-17 09:50:31 +02:00
parent 7bd6681a4a
commit c7f63d40df
3 changed files with 2 additions and 51 deletions

View File

@ -1065,7 +1065,7 @@ USE_OSGPLUGIN(<plugin2>)
</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>

View File

@ -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

View File

@ -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 @@ define $(PKG)_UPDATE
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=