diff options
| author | Michael Krelin <hacker@klever.net> | 2007-07-05 23:09:12 +0000 |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-07-05 23:09:12 +0000 |
| commit | cca64dcefa7950d7cb7844d2c0cdac3b828466a3 (patch) | |
| tree | c6997c6564264ac3d7e7db6650954aa0f858a6b5 /packages | |
| parent | e9a903f533520ef4d8ec1c2c997bd76411eab41b (diff) | |
gtkhtml-3.6: fix cross-compile badness and close bug #2528
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch | 25 | ||||
| -rw-r--r-- | packages/gtkhtml/gtkhtml-3.6_3.6.2.bb | 4 |
3 files changed, 28 insertions, 1 deletions
diff --git a/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty b/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty diff --git a/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch b/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch new file mode 100644 index 0000000000..f69b0f3421 --- /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 fd5fde49ed..cb2b8b2acc 100644 --- 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() { |