From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch | 36 -------------------------- gtkhtml/gtkhtml-3.0_3.0.10.bb | 0 gtkhtml/gtkhtml-3.1_3.1.16.bb | 0 3 files changed, 36 deletions(-) delete mode 100644 gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch delete mode 100644 gtkhtml/gtkhtml-3.0_3.0.10.bb delete mode 100644 gtkhtml/gtkhtml-3.1_3.1.16.bb (limited to 'gtkhtml') diff --git a/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch b/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch deleted file mode 100644 index 6ec7409bd4..0000000000 --- a/gtkhtml/gtkhtml-3.0/fix-missing-colormap.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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/gtkhtml/gtkhtml-3.0_3.0.10.bb b/gtkhtml/gtkhtml-3.0_3.0.10.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/gtkhtml/gtkhtml-3.1_3.1.16.bb b/gtkhtml/gtkhtml-3.1_3.1.16.bb deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3