[oe-commits] org.oe.dev gtkhtml-3.6: fix cross-compile badness and close bug #2528

[polyonymous commit]

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

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: ffd0514c9303d625e47c28920ddf079f27f6a27b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ffd0514c9303d625e47c28920ddf079f27f6a27b
Files:
1
packages/gtkhtml/gtkhtml-3.6
packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
Diffs:

#
# mt diff -rdf19f0a694e33ee20caff66ddcb86bf938b6d16f -rffd0514c9303d625e47c28920ddf079f27f6a27b
#
# 
# 
# add_dir "packages/gtkhtml/gtkhtml-3.6"
# 
# add_file "packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch"
#  content [24ca1839c8f9660e8791e4a91370e3e6f805a70f]
# 
# patch "packages/gtkhtml/gtkhtml-3.6_3.6.2.bb"
#  from [8e6b36356e74e2e1e8b0ca6bb493a488f4df5610]
#    to [635c93b9d318b910d01d772af59963371fdab2cd]
# 
============================================================
--- packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch	24ca1839c8f9660e8791e4a91370e3e6f805a70f
+++ packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch	24ca1839c8f9660e8791e4a91370e3e6f805a70f
@@ -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- at 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\"	\
============================================================
--- packages/gtkhtml/gtkhtml-3.6_3.6.2.bb	8e6b36356e74e2e1e8b0ca6bb493a488f4df5610
+++ packages/gtkhtml/gtkhtml-3.6_3.6.2.bb	635c93b9d318b910d01d772af59963371fdab2cd
@@ -1,8 +1,10 @@ DEPENDS = "gtk+ gail libbonoboui libgnom
 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() {