[oe-commits] [meta-openembedded] 35/60: fbreader: add cflags fix for fribidi 0.19.7

[git at git.openembedded.org]

martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.

commit 232d1943d3f32f2047e3df37f67bdce88d33a4e8
Author: Derek Straka <derek at asterius.io>
AuthorDate: Tue May 3 11:50:29 2016 -0400

    fbreader: add cflags fix for fribidi 0.19.7
    
    Signed-off-by: Derek Straka <derek at asterius.io>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit 5bece73f64ae7f736cd08eef387d67d74e31a424)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch        | 11 +++++++++++
 meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb         |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch
new file mode 100644
index 0000000..e72fa8c
--- /dev/null
+++ b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch
@@ -0,0 +1,11 @@
+--- fbreader-0.12.10/makefiles/config.mk.orig	2016-05-03 11:11:07.259734561 -0400
++++ fbreader-0.12.10/makefiles/config.mk	2016-05-03 11:11:37.447735786 -0400
+@@ -38,7 +38,7 @@
+ 	LDFLAGS += -pg
+ endif
+ 
+-ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
++ZINCLUDE = $(shell pkg-config --cflags fribidi) -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
+ 
+ ZLSHARED ?= yes
+ 
diff --git a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
index e9ead0f..1487f11 100644
--- a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
+++ b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
@@ -9,7 +9,8 @@ PR = "r1"
 
 SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
 file://Makefile.patch \
-file://gcc45.patch"
+file://gcc45.patch \
+file://fix-cflags-fribidi.patch"
 
 # Set the defaults
 READER_RESOLUTION ?= "1024x600"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.