rpms/kdelibs/F-9 kdelibs-4.1.2-googlemaps.patch, NONE, 1.1 kdelibs.spec, 1.358, 1.359

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2279

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.2-googlemaps.patch 
Log Message:
backport fix for google maps



kdelibs-4.1.2-googlemaps.patch:

--- NEW FILE kdelibs-4.1.2-googlemaps.patch ---
Index: khtml/ecma/kjs_dom.cpp
===================================================================
--- khtml/ecma/kjs_dom.cpp	(Revision 869317)
+++ khtml/ecma/kjs_dom.cpp	(Revision 869318)
@@ -362,30 +362,30 @@
 
     switch (token) {
     case OffsetLeft:
-      return rend ? jsNumber( rend->offsetLeft() ) : jsUndefined();
+      return rend ? jsNumber( rend->offsetLeft() ) : jsNumber(0);
     case OffsetTop:
-      return rend ? jsNumber( rend->offsetTop() ) : jsUndefined();
+      return rend ? jsNumber( rend->offsetTop() ) : jsNumber(0);
     case OffsetWidth:
-      return rend ? jsNumber( rend->offsetWidth() ) : jsUndefined();
+      return rend ? jsNumber( rend->offsetWidth() ) : jsNumber(0);
     case OffsetHeight:
-      return rend ? jsNumber( rend->offsetHeight() ) : jsUndefined();
+      return rend ? jsNumber( rend->offsetHeight() ) : jsNumber(0);
     case OffsetParent:
     {
       khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
       return getDOMNode( exec, par ? par->element() : 0 );
     }
     case ClientWidth:
-      return rend ? jsNumber( rend->clientWidth() ) : jsUndefined();
+      return rend ? jsNumber( rend->clientWidth() ) : jsNumber(0);
     case ClientHeight:
-      return rend ? jsNumber( rend->clientHeight() ) : jsUndefined();
+      return rend ? jsNumber( rend->clientHeight() ) : jsNumber(0);
     case ClientLeft:
-      return rend ? jsNumber( rend->clientLeft() ) : jsUndefined();
+      return rend ? jsNumber( rend->clientLeft() ) : jsNumber(0);
     case ClientTop:
-      return rend ? jsNumber( rend->clientTop() ) : jsUndefined();
+      return rend ? jsNumber( rend->clientTop() ) : jsNumber(0);
     case ScrollWidth:
-      return rend ? jsNumber(rend->scrollWidth()) : jsUndefined();
+      return rend ? jsNumber(rend->scrollWidth()) : jsNumber(0);
     case ScrollHeight:
-      return rend ? jsNumber(rend->scrollHeight()) : jsUndefined();
+      return rend ? jsNumber(rend->scrollHeight()) : jsNumber(0);
     case ScrollLeft:
       if (rend && rend->layer()) {
           if (rend->isRoot() && !rend->hasOverflowClip())


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- kdelibs.spec	29 Sep 2008 03:29:08 -0000	1.358
+++ kdelibs.spec	8 Oct 2008 20:39:02 -0000	1.359
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,6 +78,7 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
+Patch100: kdelibs-4.1.2-googlemaps.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -203,6 +204,7 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
+%patch100 -p0 -b .googlemaps
 
 %build
 
@@ -363,6 +365,9 @@
 
 
 %changelog
+* Wed Oct 08 2008 Than Ngo <than at redhat.com> 4.1.2-3
+- backport fix for google maps
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem