diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-02-08 19:51:20 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-02-08 19:51:38 +0100 |
| commit | 7d0f7e6d8f1d3e3058441e3cf6f8dd4256caf092 (patch) | |
| tree | 8d15ad69f024996fa89649c1a63bfbf7538ee25c | |
| parent | 783581eea91cf1ec8870625cae7ea606df3c98cf (diff) | |
fribidi: Fix Windows build some more
| -rw-r--r-- | recipes/fribidi.recipe | 3 | ||||
| -rw-r--r-- | recipes/fribidi/0002-doc-Fix-build-on-Windows-some-more.patch | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/fribidi.recipe b/recipes/fribidi.recipe index e41d2fad..0c4fde28 100644 --- a/recipes/fribidi.recipe +++ b/recipes/fribidi.recipe @@ -8,7 +8,8 @@ class Recipe(recipe.Recipe): licenses = [License.LGPLv2_1Plus] autoreconf = True deps = ['glib'] - patches = ['fribidi/0001-fribidi.def-Include-all-required-symbols.patch'] + patches = ['fribidi/0001-fribidi.def-Include-all-required-symbols.patch', + 'fribidi/0002-doc-Fix-build-on-Windows-some-more.patch'] files_libs = ['libfribidi'] files_bins = ['fribidi'] diff --git a/recipes/fribidi/0002-doc-Fix-build-on-Windows-some-more.patch b/recipes/fribidi/0002-doc-Fix-build-on-Windows-some-more.patch new file mode 100644 index 00000000..e59c5f05 --- /dev/null +++ b/recipes/fribidi/0002-doc-Fix-build-on-Windows-some-more.patch @@ -0,0 +1,28 @@ +From 6128f5208f38f60179e32bc1f1cfed8de25c7ea8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Sat, 8 Feb 2014 19:49:01 +0100 +Subject: [PATCH 2/2] doc: Fix build on Windows some more + +--- + doc/Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 7fe8d37..f2a30ee 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -16,11 +16,6 @@ include $(top_srcdir)/charset/Headers.mk + headers += $(libfribidi_char_sets_la_headers) + includepath += -I$(top_srcdir)/charset + includevpath += :$(top_srcdir)/charset +-if FRIBIDI_CHARSETS +-inst_symbols += $(libfribidi_char_sets_la_symbols) +-else # !FRIBIDI_CHARSETS +-noinst_symbols += $(libfribidi_char_sets_la_symbols) +-endif # !FRIBIDI_CHARSETS + + # The lib/Headers.mk stuff should come after all optional stuff. + include $(top_srcdir)/lib/Headers.mk +-- +1.9.rc1 + |