summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/fribidi.recipe2
-rw-r--r--recipes/fribidi/0002-doc-Fix-build-on-Windows-some-more.patch28
-rw-r--r--recipes/fribidi/0002-fribidi-disable-docs.patch25
3 files changed, 26 insertions, 29 deletions
diff --git a/recipes/fribidi.recipe b/recipes/fribidi.recipe
index 0c4fde28..e0efa8f0 100644
--- a/recipes/fribidi.recipe
+++ b/recipes/fribidi.recipe
@@ -9,7 +9,7 @@ class Recipe(recipe.Recipe):
autoreconf = True
deps = ['glib']
patches = ['fribidi/0001-fribidi.def-Include-all-required-symbols.patch',
- 'fribidi/0002-doc-Fix-build-on-Windows-some-more.patch']
+ 'fribidi/0002-fribidi-disable-docs.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
deleted file mode 100644
index e59c5f05..00000000
--- a/recipes/fribidi/0002-doc-Fix-build-on-Windows-some-more.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
diff --git a/recipes/fribidi/0002-fribidi-disable-docs.patch b/recipes/fribidi/0002-fribidi-disable-docs.patch
new file mode 100644
index 00000000..9c8afb54
--- /dev/null
+++ b/recipes/fribidi/0002-fribidi-disable-docs.patch
@@ -0,0 +1,25 @@
+From 19370f83af476b8f1fd57225a6bdd7c66290a0b2 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Tue, 11 Feb 2014 13:46:25 +0100
+Subject: [PATCH] fribidi: disable docs
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 35d7721..899f270 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,7 @@
+ ##############################################################################
+
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab charset lib bin doc test
++SUBDIRS = gen.tab charset lib bin test
+
+ EXTRA_DIST = bootstrap ChangeLog.old
+
+--
+1.8.3.2
+