rpms/kdelibs/F-11 kdelibs-4.2.3-gcc44.patch, NONE, 1.1 kdelibs.spec, 1.476, 1.477
Than Ngo
than at fedoraproject.org
Tue May 5 09:02:31 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9843
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.2.3-gcc44.patch
Log Message:
fix a gcc4.4 build error
kdelibs-4.2.3-gcc44.patch:
--- NEW FILE kdelibs-4.2.3-gcc44.patch ---
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;
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- kdelibs.spec 4 May 2009 21:37:23 -0000 1.476
+++ kdelibs.spec 5 May 2009 09:02:01 -0000 1.477
@@ -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@@|%{versi
# upstream patches
# 4.2
%patch100 -p1 -b .strcasestr-glibc2.9
+%patch101 -p1 -b .gcc44
# 4.3
%patch200 -p1 -b .AllowExternalPaths
More information about the fedora-extras-commits
mailing list