rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fxi gcc-4.4 build issue

This commit is contained in:
Than Ngo 2009-05-05 09:34:41 +00:00
parent 09d7974519
commit b3b24ffe98
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kdelibs-4.2.3-gcc44.patch Normal file
View 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;

2
kdelibs.spec
View File

@ -83,6 +83,7 @@ Patch22: kdelibs-4.1.96-cmake.patch
# upstream
# 4.2 branch
Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
Patch101: kdelibs-4.2.3-gcc44.patch
# 4.3 branch
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@ -220,6 +221,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
# 4.2
%patch100 -p1 -b .strcasestr-glibc2.9
%patch101 -p1 -b .gcc44
# 4.3
%patch200 -p1 -b .AllowExternalPaths