fontconfig: bump version.

* remove old recipes.
This commit is contained in:
Jerome Duval
2015-10-12 22:39:35 +00:00
parent 59093a7f68
commit 9a3e41dba6
5 changed files with 41 additions and 128 deletions

View File

@@ -1,12 +0,0 @@
diff -ur fontconfig-2.10.0/src/fcatomic.c fontconfig-2.10.0-haiku/src/fcatomic.c
--- fontconfig-2.10.0/src/fcatomic.c 2012-06-17 21:49:30.023855104 -0400
+++ fontconfig-2.10.0-haiku/src/fcatomic.c 2012-07-18 19:39:56.629145600 -0400
@@ -132,7 +132,7 @@
return FcFalse;
}
ret = link ((char *) atomic->tmp, (char *) atomic->lck);
- if (ret < 0 && errno == EPERM)
+ if (ret < 0 && (errno == EPERM || errno == B_UNSUPPORTED))
{
/* the filesystem where atomic->lck points to may not supports
* the hard link. so better try to fallback

View File

@@ -1,22 +0,0 @@
diff --git a/test/Makefile.am b/test/Makefile.am
index 52c63dc..f270b50 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,7 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-check_PROGRAMS = test-migration
+check_PROGRAMS =
if HAVE_PTHREAD
check_PROGRAMS += test-pthread
test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
@@ -26,7 +26,8 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
endif
noinst_PROGRAMS = $(check_PROGRAMS)
+check_PROGRAMS +=
test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)