diff options
Diffstat (limited to 'kde/patch/kdelibs')
-rw-r--r-- | kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz | bin | 0 -> 493 bytes | |||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch | 24 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch | 48 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch | 65 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.upnp_conditional.patch | 15 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | bin | 0 -> 347 bytes |
6 files changed, 0 insertions, 152 deletions
diff --git a/kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz b/kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz Binary files differnew file mode 100644 index 0000000..1aa1934 --- /dev/null +++ b/kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz diff --git a/kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch b/kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch deleted file mode 100644 index b44b865..0000000 --- a/kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit bd70d4e589711fda9ab07738c46e37eee8376214 -Author: David Faure <faure@kde.org> -Date: Thu Jun 30 23:43:45 2011 +0200 - - Security fix: don't interpret html tags - - Credits to Tim Brown for the find. - -diff --git a/kio/kssl/ksslcertificatebox.cpp b/kio/kssl/ksslcertificatebox.cpp -index 4ffc613..094787a 100644 ---- a/kio/kssl/ksslcertificatebox.cpp -+++ b/kio/kssl/ksslcertificatebox.cpp -@@ -36,6 +36,10 @@ KSslCertificateBox::KSslCertificateBox(QWidget *parent) - d(new KSslCertificateBoxPrivate()) - { - d->ui.setupUi(this); -+ // No fooling us with html tags -+ Q_FOREACH(QLabel* label, qFindChildren<QLabel *>(this)) { -+ label->setTextFormat(Qt::PlainText); -+ } - } - - - diff --git a/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch b/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch deleted file mode 100644 index 048f2d0..0000000 --- a/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 73283f1332e90fbb6fe0caa39a038cb16b83a54c -Author: David Faure <faure@kde.org> -Date: Wed Dec 5 22:42:25 2012 +0100 - - Revert "Also check parent mimetypes in protocolForArchiveMimetype()." - - This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05. - It breaks opening odt and other zip-based files in external apps. - That's what I get for delegating the testing :-) - BUG: 311214 - -diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp -index 3f1cadd..502a3e6 100644 ---- a/kio/kio/kprotocolmanager.cpp -+++ b/kio/kio/kprotocolmanager.cpp -@@ -47,7 +47,6 @@ - #include <ksharedconfig.h> - #include <kstandarddirs.h> - #include <kurl.h> --#include <kmimetype.h> - #include <kmimetypetrader.h> - #include <kprotocolinfofactory.h> - -@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType ) - } - } - } -- const QString prot = d->protocolForArchiveMimetypes.value(mimeType); -- if (!prot.isEmpty()) -- return prot; -- -- // Check parent mimetypes -- KMimeType::Ptr mime = KMimeType::mimeType(mimeType); -- if (mime) { -- const QStringList parentMimeTypes = mime->allParentMimeTypes(); -- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) { -- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType); -- if (!res.isEmpty()) { -- return res; -- } -- } -- } -- -- return QString(); -+ return d->protocolForArchiveMimetypes.value(mimeType); - } - - #undef PRIVATE_DATA diff --git a/kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch b/kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch deleted file mode 100644 index 819a429..0000000 --- a/kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h -index 055482e..3880e13 100644 ---- a/nepomuk/query/querybuilderdata_p.h -+++ b/nepomuk/query/querybuilderdata_p.h -@@ -32,6 +32,28 @@ - #include "query_p.h" - #include "groupterm_p.h" - -+namespace { -+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle -+/// utf8 chars which use more than one char, ie. wide chars. -+/// Thus, we simply truncate each term at the first wide char. -+QStringList stripExtendedCharsHack(const QStringList& terms) { -+ QStringList newTerms; -+ foreach(const QString& term, terms) { -+ int i = 0; -+ while(i < term.length()) { -+ if(term[i].unicode() > 0x7f) { -+ break; -+ } -+ ++i; -+ } -+ if(i > 0) { -+ newTerms.append(term.left(i)); -+ } -+ } -+ return newTerms; -+} -+} -+ - namespace Nepomuk { - namespace Query { - class QueryBuilderData -@@ -246,16 +268,23 @@ namespace Nepomuk { - for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin(); - it != m_fullTextSearchTerms.constEnd(); ++it ) { - const QString& varName = it.key(); -- const QStringList& terms = it.value(); -- // bif:search_excerpt wants a vector of all search terms -- excerptParts -- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)") -- .arg( terms.join(QLatin1String("','")), -- varName ); -+ const QStringList terms = stripExtendedCharsHack(it.value()); -+ if(terms.count()) { -+ // bif:search_excerpt wants a vector of all search terms -+ excerptParts -+ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)") -+ .arg( terms.join(QLatin1String("','")), -+ varName ); -+ } - } - -- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") -- .arg(excerptParts.join(QLatin1String(","))); -+ if(excerptParts.count()) { -+ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") -+ .arg(excerptParts.join(QLatin1String(","))); -+ } -+ else { -+ return QString(); -+ } - } - else { - return QString(); diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch deleted file mode 100644 index 3a19447..0000000 --- a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig 2011-07-27 20:34:39.000000000 +0200 -+++ kdelibs-4.8.0/solid/solid/managerbase.cpp 2012-01-26 09:17:49.409993419 +0100 -@@ -90,7 +90,11 @@ - # endif - - # if defined (HUPNP_FOUND) -- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); -+ bool solidUpnpEnabled -+ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1; -+ if (solidUpnpEnabled) { -+ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); -+ } - # endif - } - } diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz Binary files differnew file mode 100644 index 0000000..479980f --- /dev/null +++ b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz |