fix gcc-4.4 builld issue
This commit is contained in:
parent
3537acf5aa
commit
a8865794f2
12
kdelibs-4.2.3-gcc44.patch
Normal file
12
kdelibs-4.2.3-gcc44.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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;
|
@ -83,6 +83,7 @@ Patch22: kdelibs-4.1.96-cmake.patch
|
|||||||
# upstream
|
# upstream
|
||||||
# 4.2 branch
|
# 4.2 branch
|
||||||
Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
|
Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
|
||||||
|
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
|
||||||
@ -220,6 +221,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.2
|
# 4.2
|
||||||
%patch100 -p1 -b .strcasestr-glibc2.9
|
%patch100 -p1 -b .strcasestr-glibc2.9
|
||||||
|
%patch101 -p1 -b .gcc44
|
||||||
|
|
||||||
# 4.3
|
# 4.3
|
||||||
%patch200 -p1 -b .AllowExternalPaths
|
%patch200 -p1 -b .AllowExternalPaths
|
||||||
|
Loading…
Reference in New Issue
Block a user