From c236ea3d8a7625f9b34a724bb80d038fc6618e90 Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Sun, 31 May 2009 17:38:28 +0000 Subject: [PATCH] drop upstream patch --- kdelibs-4.2.3-gcc44.patch | 12 ------------ kdelibs.spec | 2 -- 2 files changed, 14 deletions(-) delete mode 100644 kdelibs-4.2.3-gcc44.patch diff --git a/kdelibs-4.2.3-gcc44.patch b/kdelibs-4.2.3-gcc44.patch deleted file mode 100644 index 92f61b4..0000000 --- a/kdelibs-4.2.3-gcc44.patch +++ /dev/null @@ -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; diff --git a/kdelibs.spec b/kdelibs.spec index 634b78d..8c2f654 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -82,7 +82,6 @@ Patch22: kdelibs-4.1.96-cmake.patch # upstream # 4.2 branch -Patch101: kdelibs-4.2.3-gcc44.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -219,7 +218,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstream patches # 4.2 -%patch101 -p1 -b .gcc44 # 4.3 %patch200 -p1 -b .AllowExternalPaths