rpms/kdelibs4/F-8 kdelibs-4.1.2-googlemaps.patch, NONE, 1.1 kdelibs4.spec, 1.37, 1.38
Kevin Kofler
kkofler at fedoraproject.org
Thu Oct 9 14:07:19 UTC 2008
- Previous message: [pkgdb] koffice: rdieter has requested approveacls
- Next message: rpms/kdebase4/F-8 kdebase-4.1.2-konsole-session-1.patch, NONE, 1.1 kdebase-4.1.2-konsole-session.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdebase4.spec, 1.19, 1.20 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21466/F-8
Modified Files:
kdelibs4.spec
Added Files:
kdelibs-4.1.2-googlemaps.patch
Log Message:
Sync from kdelibs/F-9:
* Wed Oct 08 2008 Than Ngo <than at redhat.com> 4.1.2-3
- 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: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdelibs4.spec 6 Oct 2008 00:03:50 -0000 1.37
+++ kdelibs4.spec 9 Oct 2008 14:06:48 -0000 1.38
@@ -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
- Previous message: [pkgdb] koffice: rdieter has requested approveacls
- Next message: rpms/kdebase4/F-8 kdebase-4.1.2-konsole-session-1.patch, NONE, 1.1 kdebase-4.1.2-konsole-session.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdebase4.spec, 1.19, 1.20 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list