gtkhtml-3.6: fix cross-compile badness and close bug #2528

diff --git a/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty b/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch b/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
new file mode 100644 (file)
index 0000000..f69b0f3
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
@@ -0,0 +1,25 @@
+diff --git a/components/html-editor/Makefile.am b/components/html-editor/Makefile.am
+index 7fda5ae..925e409 100644
+--- a/components/html-editor/Makefile.am
++++ b/components/html-editor/Makefile.am
+@@ -5,7 +5,7 @@ gtkhtml_data = $(datadir)/gtkhtml-@GTKHTML_API_VERSION@
+ gladedir = $(gtkhtml_data)
+ glade_DATA = gtkhtml-editor-properties.glade
+ 
+-INCLUDES = -I$(top_srcdir)/src -I$(srcdir) -I$(includedir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
++INCLUDES = -I$(top_srcdir)/src -I$(srcdir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
+       -DG_LOG_DOMAIN=\"gtkhtml\" \
+       -DSRCDIR=\"$(srcdir)\" \
+       -DPREFIX=\"$(prefix)\"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f76178f..2d70183 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,6 @@ NULL=
+ INCLUDES =                            \
+       -I$(top_srcdir)                 \
+       -I$(srcdir)                     \
+-      -I$(includedir)                 \
+       $(GTKHTML_CFLAGS)               \
+       $(SOUP_CFLAGS)                  \
+       -DG_LOG_DOMAIN=\"gtkhtml\"      \

diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
index fd5fde4..cb2b8b2 100644 (file)
--- a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
+++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
@@ -2,7 +2,9 @@ require gtkhtml.inc
 
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
 
-SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \
+       file://cross-includedir.patch;patch=1"
+PR = "r1"
 FILES_${PN} += "${datadir}/gtkhtml-3.6"
 
 do_stage() {