drop upstream patch
This commit is contained in:
parent
d0a486dd85
commit
c236ea3d8a
|
@ -1,12 +0,0 @@
|
||||||
diff -up kdelibs-4.2.3/khtml/misc/loader.cpp.orig kdelibs-4.2.3/khtml/misc/loader.cpp
|
|
||||||
--- kdelibs-4.2.3/khtml/misc/loader.cpp.orig 2009-05-05 10:50:56.000000000 +0200
|
|
||||||
+++ kdelibs-4.2.3/khtml/misc/loader.cpp 2009-05-05 10:54:01.000000000 +0200
|
|
||||||
@@ -329,7 +329,7 @@ QString CachedCSSStyleSheet::checkCharse
|
|
||||||
if (strncmp(d, "@charset \"",10) == 0)
|
|
||||||
{
|
|
||||||
// the string until "; is the charset name
|
|
||||||
- char *p = strchr(d+10, '"');
|
|
||||||
+ const char *p = strchr(d+10, '"');
|
|
||||||
if (p == 0) return m_charset;
|
|
||||||
QString charset = QString::fromAscii(d+10, p-(d+10));
|
|
||||||
return charset;
|
|
|
@ -82,7 +82,6 @@ Patch22: kdelibs-4.1.96-cmake.patch
|
||||||
|
|
||||||
# upstream
|
# upstream
|
||||||
# 4.2 branch
|
# 4.2 branch
|
||||||
Patch101: kdelibs-4.2.3-gcc44.patch
|
|
||||||
|
|
||||||
# 4.3 branch
|
# 4.3 branch
|
||||||
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
|
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
|
||||||
|
@ -219,7 +218,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.2
|
# 4.2
|
||||||
%patch101 -p1 -b .gcc44
|
|
||||||
|
|
||||||
# 4.3
|
# 4.3
|
||||||
%patch200 -p1 -b .AllowExternalPaths
|
%patch200 -p1 -b .AllowExternalPaths
|
||||||
|
|
Loading…
Reference in New Issue