From cc22988313a5ad76ea4a90ee2f997c95cfa6dea2 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 5 May 2009 09:02:01 +0000 Subject: [PATCH] fix a gcc4.4 build error --- kdelibs-4.2.3-gcc44.patch | 12 ++++++++++++ kdelibs.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 kdelibs-4.2.3-gcc44.patch diff --git a/kdelibs-4.2.3-gcc44.patch b/kdelibs-4.2.3-gcc44.patch new file mode 100644 index 0000000..92f61b4 --- /dev/null +++ b/kdelibs-4.2.3-gcc44.patch @@ -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; diff --git a/kdelibs.spec b/kdelibs.spec index d60cc2a..a70b5fc 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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