[oe-commits] org.oe.dev dillo2: fix compilation problem with patch from Marek Vasut. Clean white space. Closes 2032.

[Laibsch commit]

dillo2: fix compilation problem with patch from Marek Vasut.  Clean white space.  Closes 2032.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 54b5034e417df956293313c72b20c0635941bd17
ViewMTN: http://monotone.openembedded.org/revision/info/54b5034e417df956293313c72b20c0635941bd17
Files:
1
packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch
packages/dillo/dillo2_0.6.6.bb
Diffs:

#
# mt diff -r6b7c0c3dac8c78f914c1ae831e43add6feb3f5fa -r54b5034e417df956293313c72b20c0635941bd17
#
#
#
# add_file "packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch"
#  content [202c5030197c77a7e591f45e2c3c1f1c64514008]
# 
# patch "packages/dillo/dillo2_0.6.6.bb"
#  from [4af6de83b3689bac200b30de963eee3f08d233a4]
#    to [bb11f1c4f78265b997d5349730d44e6214a83106]
#
============================================================
--- packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch	202c5030197c77a7e591f45e2c3c1f1c64514008
+++ packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch	202c5030197c77a7e591f45e2c3c1f1c64514008
@@ -0,0 +1,27 @@
+diff -Naur dillo-0.6.6-orig/src/dw_table.c dillo-0.6.6/src/dw_table.c
+--- dillo-0.6.6-orig/src/dw_table.c	2007-03-22 22:46:10.000000000 +0100
++++ dillo-0.6.6/src/dw_table.c	2007-03-22 22:48:57.000000000 +0100
+@@ -1177,7 +1177,10 @@
+               sub_extr_width = rest_w * cols_per_sub / rest_n;
+               rest_w -= sub_extr_width;
+               rest_n -= cols_per_sub;
+-              EXTR_VALUE (sub_extremes[i]) = sub_extr_width;
++	      if(max)
++                sub_extremes[i].max_width = sub_extr_width;
++	      else
++                sub_extremes[i].min_width = sub_extr_width;
+             }
+          }
+       } else {
+@@ -1196,7 +1199,10 @@
+                   delta = rest_w * EXTR_VALUE (sub_extremes[i]) / rest_n;
+                   rest_w -= delta;
+                   rest_n -= EXTR_VALUE (sub_extremes[i]);
+-                  EXTR_VALUE (sub_extremes[i]) += delta;
++		  if(max)
++                    sub_extremes[i].max_width += delta;
++		  else
++                    sub_extremes[i].min_width += delta;
+                }
+                DEBUG_MSG (DEBUG_WIDTH_LEVEL + 2, "%d\n",
+                           EXTR_VALUE (sub_extremes[i]));
============================================================
--- packages/dillo/dillo2_0.6.6.bb	4af6de83b3689bac200b30de963eee3f08d233a4
+++ packages/dillo/dillo2_0.6.6.bb	bb11f1c4f78265b997d5349730d44e6214a83106
@@ -4,11 +4,12 @@ SRC_URI="http://www.dillo.org/download/d
 DEPENDS = "gtk+"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
 SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \
+         file://dillo2-gcc4.patch;patch=1;pnum=1 \
          file://gtk2.patch;patch=1;pnum=1 \
-	 file://fix_about_syntax.patch;patch=1;pnum=1 \
-	 file://dillo.desktop \
-	 file://dillo.png \
-	 file://dillorc"
+         file://fix_about_syntax.patch;patch=1;pnum=1 \
+         file://dillo.desktop \
+         file://dillo.png \
+         file://dillorc"
 
 PRIORITY = "optional"