From 4fbba6350edd17d9272a668b5ba564f558974a94 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Tue, 7 Feb 2006 04:22:50 +0000 Subject: Add curl (new dependency of Web), fix a fontconfig-native build issue, update gtkhtml2 patches and update to a newer more functional Web snapshot git-svn-id: https://svn.o-hand.com/repos/poky@251 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../gtkhtml2/files/fix-background-min-max.patch | 66 ---------------------- 1 file changed, 66 deletions(-) delete mode 100644 openembedded/packages/gtkhtml2/files/fix-background-min-max.patch (limited to 'openembedded/packages/gtkhtml2/files/fix-background-min-max.patch') diff --git a/openembedded/packages/gtkhtml2/files/fix-background-min-max.patch b/openembedded/packages/gtkhtml2/files/fix-background-min-max.patch deleted file mode 100644 index af557c8fa..000000000 --- a/openembedded/packages/gtkhtml2/files/fix-background-min-max.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: gtkhtml2/libgtkhtml/layout/html/htmlboximage.c -=================================================================== ---- gtkhtml2.orig/libgtkhtml/layout/html/htmlboximage.c 2005-12-28 22:07:37.000000000 +0000 -+++ gtkhtml2/libgtkhtml/layout/html/htmlboximage.c 2006-01-22 03:20:36.000000000 +0000 -@@ -167,6 +167,8 @@ - width = (gint)(floor ((gfloat)(height * gdk_pixbuf_get_width (pixbuf))/(gfloat)gdk_pixbuf_get_height (pixbuf)) + 0.5); - } - } -+ -+ html_box_check_min_max_width_height (box, &width, &height); - - if (old_width != width || old_height != height) - html_box_image_update_scaled_pixbuf (image, width, height); -Index: gtkhtml2/libgtkhtml/layout/htmlbox.c -=================================================================== ---- gtkhtml2.orig/libgtkhtml/layout/htmlbox.c 2004-01-08 08:57:29.000000000 +0000 -+++ gtkhtml2/libgtkhtml/layout/htmlbox.c 2006-01-22 03:20:41.000000000 +0000 -@@ -24,6 +24,7 @@ - #include "layout/htmlbox.h" - #include "layout/htmlboxtext.h" - #include "layout/html/htmlboxform.h" -+#include "layout/html/htmlboximage.h" - #include "layout/htmlboxinline.h" - #include "layout/htmlboxtablerow.h" - #include "gtkhtmlcontext.h" -@@ -817,6 +818,8 @@ - html_box_check_min_max_width_height (HtmlBox *self, gint *boxwidth, gint *boxheight) - { - int tmp; -+ gint old_width = *boxwidth; -+ gint old_height = *boxheight; - - if (self->parent) { - if (HTML_BOX_GET_STYLE (self)->box->min_width.type != HTML_LENGTH_AUTO) { -@@ -868,6 +871,31 @@ - if (*boxheight > html_length_get_value (&HTML_BOX_GET_STYLE (self)->box->max_height, 0)) - *boxheight = html_length_get_value (&HTML_BOX_GET_STYLE (self)->box->max_height, 0); - } -+ -+ /* Maintain aspect ratio if it's an image - bias towards making image smaller */ -+ if (HTML_IS_BOX_IMAGE (self)) { -+ if ((*boxwidth > old_width) && (*boxheight >= old_height)) { -+ *boxheight = *boxheight * (gdouble)(*boxwidth / (gdouble)old_width); -+ html_box_check_min_max_width_height (self, boxwidth, boxheight); -+ return; -+ } -+ -+ if ((*boxheight > old_height) && (*boxwidth >= old_width)) { -+ *boxwidth = *boxwidth * (gdouble)(*boxheight / (gdouble)old_height); -+ html_box_check_min_max_width_height (self, boxwidth, boxheight); -+ return; -+ } -+ -+ if ((*boxwidth < old_width) && (*boxheight <= old_height)) { -+ *boxheight = *boxheight * (gdouble)(*boxwidth / (gdouble)old_width); -+ return; -+ } -+ -+ if ((*boxheight < old_height) && (*boxwidth <= old_width)) { -+ *boxwidth = *boxwidth * (gdouble)(*boxheight / (gdouble)old_height); -+ return; -+ } -+ } - } - - static void -- cgit v1.2.3