import clean BK tree at cset 1.3670

6 files changed, 103 insertions, 0 deletions

diff --git a/packages/gtkhtml/.mtn2git_empty b/packages/gtkhtml/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtkhtml/.mtn2git_empty
diff --git a/packages/gtkhtml/gtkhtml-3.0/.mtn2git_empty b/packages/gtkhtml/gtkhtml-3.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.0/.mtn2git_empty
diff --git a/packages/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch b/packages/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch
index e69de29bb2..6ec7409bd4 100644
--- a/packages/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch
+++ b/packages/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch
@@ -0,0 +1,36 @@
+--- gtkhtml-3.0.10/src/htmlgdkpainter.c.orig	2004-07-23 17:07:05.000000000 +0100
++++ gtkhtml-3.0.10/src/htmlgdkpainter.c	2004-07-23 17:17:09.000000000 +0100
+@@ -277,22 +277,19 @@
+ begin (HTMLPainter *painter, int x1, int y1, int x2, int y2)
+ {
+ 	HTMLGdkPainter *gdk_painter;
+-	GdkVisual *visual;
+ 
+ 	/* printf ("painter begin %d,%d %d,%d\n", x1, y1, x2, y2); */
+ 
+ 	gdk_painter = HTML_GDK_PAINTER (painter);
+ 	g_return_if_fail (gdk_painter->window != NULL);
+-	visual = gdk_drawable_get_visual (gdk_painter->window);
+-	g_return_if_fail (visual != NULL);
+ 
+ 	if (gdk_painter->double_buffer){
+ 		const int width = x2 - x1 + 1;
+ 		const int height = y2 - y1 + 1;
+ 
+ 		g_assert (gdk_painter->pixmap == NULL);
+-		
+-		gdk_painter->pixmap = gdk_pixmap_new (gdk_painter->pixmap, width, height, visual->depth);
++
++		gdk_painter->pixmap = gdk_pixmap_new (gdk_painter->window, width, height, -1);
+ 		gdk_painter->x1 = x1;
+ 		gdk_painter->y1 = y1;
+ 		gdk_painter->x2 = x2;
+@@ -313,6 +310,8 @@
+ 		gdk_painter->x2 = 0;
+ 		gdk_painter->y2 = 0;
+ 	}
++
++	g_assert(gdk_drawable_get_colormap(gdk_painter->pixmap) != NULL);
+ }
+ 
+ static void
diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
index e69de29bb2..4922c57143 100644
--- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
@@ -0,0 +1,25 @@
+LICENSE = GPL
+SECTION = "x11/libs"
+DESCRIPTION = "HTML rendering/editing library"
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
+PR = "r2"
+
+inherit gnome
+
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
+	file://fix-missing-colormap.patch;patch=1"
+FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
+FILES_${PN}-dev += "${libdir}/gtkhtml"
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true
+	gnome_stage_includes
+	oe_libinstall -C src -so libgtkhtml-3.0 ${STAGING_LIBDIR}
+}
+
+do_compile() {
+	oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+}
diff --git a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb
index e69de29bb2..5937b25acb 100644
--- a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb
+++ b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb
@@ -0,0 +1,18 @@
+LICENSE = GPL
+SECTION = "x11/libs"
+DESCRIPTION = "HTML rendering/editing library"
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+
+inherit gnome
+
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2"
+FILES_${PN} += "${datadir}/gtkhtml-3.1"
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	mv src/libgtkhtml.pc src/libgtkhtml-3.1.pc || true
+	gnome_stage_includes
+	oe_libinstall -C src -so libgtkhtml-3.1 ${STAGING_LIBDIR}
+}
diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
index e69de29bb2..8ed1fa938c 100644
--- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
@@ -0,0 +1,24 @@
+LICENSE = GPL
+SECTION = "x11/libs"
+DESCRIPTION = "HTML rendering/editing library"
+DEPENDS = "gtk+ gail libgnomeprint orbit2-native"
+PR = "r1"
+
+inherit gnome
+
+SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" 
+FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
+FILES_${PN}-dev += "${libdir}/gtkhtml"
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true
+	gnome_stage_includes
+	oe_libinstall -C src -so libgtkhtml-3.0 ${STAGING_LIBDIR}
+}
+
+do_compile() {
+	oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+}