drop upstream patches
This commit is contained in:
parent
de1a48202f
commit
b5a97b5a35
@ -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");
|
|
@ -86,7 +86,6 @@ Patch25: kdelibs-4.2.0-gcc44-misc.patch
|
|||||||
|
|
||||||
# upstream
|
# upstream
|
||||||
# 4.2 branch
|
# 4.2 branch
|
||||||
Patch100: kdelibs-4.2.1-css.patch
|
|
||||||
Patch101: kdelibs-4.2.1-encoding-qt45.patch
|
Patch101: kdelibs-4.2.1-encoding-qt45.patch
|
||||||
|
|
||||||
# 4.3 branch
|
# 4.3 branch
|
||||||
@ -227,7 +226,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.2
|
# 4.2
|
||||||
%patch100 -p1 -b .css-style
|
|
||||||
%patch101 -p1 -b .encoding-qt45
|
%patch101 -p1 -b .encoding-qt45
|
||||||
|
|
||||||
# 4.3
|
# 4.3
|
||||||
|
Loading…
Reference in New Issue
Block a user