Upstream solved it completely different http://cgit.freedesktop.org/fontconfig/commit/?id=2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e now, so after updating fontconfig the patch will be obsolete. Applying that patch is not possible, however, since I would need to re-create the tarball.
However, I don't want to update fontconfig since it touches the whole Xorg stack and I have no possibility to test that. Signed-off-by: Bernhard Walle <[email protected]> --- .../0001-Fix-build-on-Darwin.patch | 68 ++++++++++++++++++++ patches/fontconfig-2.6.0/autogen.sh | 1 + patches/fontconfig-2.6.0/series | 4 ++ 3 files changed, 73 insertions(+) create mode 100644 patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch create mode 120000 patches/fontconfig-2.6.0/autogen.sh create mode 100644 patches/fontconfig-2.6.0/series diff --git a/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch b/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch new file mode 100644 index 0000000..89320dd --- /dev/null +++ b/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch @@ -0,0 +1,68 @@ +From 4b0e469be28dc539dac7ec9eb504b6add37dd85a Mon Sep 17 00:00:00 2001 +From: Bernhard Walle <[email protected]> +Date: Sun, 8 Apr 2012 17:38:20 +0200 +Subject: [PATCH] Fix build on Darwin + +The problem is the -rpath-link that is used even on host CC but this +option is not available on Mac OS. + +Signed-off-by: Bernhard Walle <[email protected]> +--- + fc-arch/Makefile.am | 2 +- + fc-case/Makefile.am | 2 +- + fc-glyphname/Makefile.am | 2 +- + fc-lang/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am +index 7e1dd3e..802c999 100644 +--- a/fc-arch/Makefile.am ++++ b/fc-arch/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + +diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am +index d4fa12d..9ea539f 100644 +--- a/fc-case/Makefile.am ++++ b/fc-case/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + +diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am +index 412d663..bd91007 100644 +--- a/fc-glyphname/Makefile.am ++++ b/fc-glyphname/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + +diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am +index 60e4f31..73ff946 100644 +--- a/fc-lang/Makefile.am ++++ b/fc-lang/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + diff --git a/patches/fontconfig-2.6.0/autogen.sh b/patches/fontconfig-2.6.0/autogen.sh new file mode 120000 index 0000000..9f8a4cb --- /dev/null +++ b/patches/fontconfig-2.6.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/fontconfig-2.6.0/series b/patches/fontconfig-2.6.0/series new file mode 100644 index 0000000..d9df7e0 --- /dev/null +++ b/patches/fontconfig-2.6.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-build-on-Darwin.patch +# e4c948951d2fafee17a83f484c126a7e - git-ptx-patches magic -- 1.7.9.5 -- ptxdist mailing list [email protected]
