diff --git a/kdelibs-4.1.2-googlemaps.patch b/kdelibs-4.1.2-googlemaps.patch new file mode 100644 index 0000000..4d8525d --- /dev/null +++ b/kdelibs-4.1.2-googlemaps.patch @@ -0,0 +1,45 @@ +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()) diff --git a/kdelibs.spec b/kdelibs.spec index d2add6a..69725df 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 @@ Patch18: kdelibs-4.1.0-kstandarddirs.patch 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 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch20 -p1 -b .cmake ## upstream patches +%patch100 -p0 -b .googlemaps %build @@ -363,6 +365,9 @@ rm -rf %{buildroot} %changelog +* Wed Oct 08 2008 Than Ngo 4.1.2-3 +- backport fix for google maps + * Sun Sep 28 2008 Rex Dieter 4.1.2-2 - make VERBOSE=1 - respin against new(er) kde-filesystem