From b5a97b5a3534b647e72e019683caacbf972362d7 Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Wed, 1 Apr 2009 10:32:24 +0000 Subject: [PATCH] drop upstream patches --- kdelibs-4.2.1-css.patch | 17 ----------------- kdelibs.spec | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 kdelibs-4.2.1-css.patch diff --git a/kdelibs-4.2.1-css.patch b/kdelibs-4.2.1-css.patch deleted file mode 100644 index ff85d90..0000000 --- a/kdelibs-4.2.1-css.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 a90024c..8f0e0a8 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -86,7 +86,6 @@ Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch -Patch100: kdelibs-4.2.1-css.patch Patch101: kdelibs-4.2.1-encoding-qt45.patch # 4.3 branch @@ -227,7 +226,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstream patches # 4.2 -%patch100 -p1 -b .css-style %patch101 -p1 -b .encoding-qt45 # 4.3