diff --git a/kdelibs-4.2.1-css.patch b/kdelibs-4.2.1-css.patch new file mode 100644 index 0000000..ff85d90 --- /dev/null +++ b/kdelibs-4.2.1-css.patch @@ -0,0 +1,17 @@ +--- kdelibs/khtml/ecma/kjs_css.cpp 2009/02/07 18:21:18 922888 ++++ 4.2/kdelibs/khtml/ecma/kjs_css.cpp 2009/03/09 14:38:22 937328 +@@ -222,12 +222,12 @@ + CSSStyleDeclarationImpl &styleDecl = *m_impl; + + if (propertyName == "cssText") { +- styleDecl.setCssText(value->toString(exec).domString()); ++ styleDecl.setCssText(valueToStringWithNullCheck(exec, value)); + } + else { + bool pxSuffix; + QString prop = cssPropertyName(propertyName, &pxSuffix); +- QString propvalue = value->toString(exec).qstring(); ++ QString propvalue = valueToStringWithNullCheck(exec, value).string(); + + if (pxSuffix) + propvalue += QLatin1String("px"); diff --git a/kdelibs.spec b/kdelibs.spec index a78961f..81d35a7 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -85,6 +85,7 @@ Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch +Patch100: kdelibs-4.2.1-css.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -221,6 +222,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstream patches # 4.2 +%patch100 -p1 -b .css-style # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -397,6 +399,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 09 2009 Than Ngo - 4.2.1-5 +- apply patch to fix issue in CSS style that causes konqueror shows a blank page + * Wed Mar 05 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622)