This repository has been archived by the owner on Sep 10, 2022. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ffms2, gajim, kmymoney, libgit2, libreoffce, mpg123, networkmanager, …
…phonon*, rsync
- Loading branch information
Phantom X
committed
Jun 23, 2014
1 parent
a302d71
commit 0892e4c
Showing
65 changed files
with
676 additions
and
1,370 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
kde/kdelibs/patches/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From 684bb98b31d338d85e1e6089cac381a507a5b4d8 Mon Sep 17 00:00:00 2001 | ||
| From: Luigi Toscano <luigi.toscano@tiscali.it> | ||
| Date: Fri, 13 Jun 2014 02:41:50 +0200 | ||
| Subject: [PATCH 06/12] Do not set global loading of DTD and entities, no more | ||
| needed | ||
|
|
||
| The global settings have been replaced by the fine-grained | ||
| parameters passed to xmlReadFile. | ||
| Moreover a libxml2 regression prevents those parameters from | ||
| being used when the patch for CVE-2014-0191 is applied, see | ||
| https://bugzilla.gnome.org/show_bug.cgi?id=730290 | ||
| A new libxml2 patch is going to be deployed soon, but anyway | ||
| this code works even without setting those parameters. | ||
|
|
||
| CCBUG: 335001 | ||
| --- | ||
| kdoctools/meinproc.cpp | 3 --- | ||
| 1 file changed, 3 deletions(-) | ||
|
|
||
| diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp | ||
| index 0467f22..de4fbc8 100644 | ||
| --- a/kdoctools/meinproc.cpp | ||
| +++ b/kdoctools/meinproc.cpp | ||
| @@ -157,9 +157,6 @@ int main(int argc, char **argv) { | ||
| } | ||
| } | ||
|
|
||
| - xmlSubstituteEntitiesDefault(1); | ||
| - xmlLoadExtDtdDefaultValue = 1; | ||
| - | ||
| QVector<const char *> params; | ||
| #ifndef Q_WS_WIN | ||
| // libxslt parses the path given to outputFile as XPath expression which fails | ||
| -- | ||
| 1.8.3.1 | ||
|
|
58 changes: 58 additions & 0 deletions
58
kde/kdelibs/patches/0008-Don-t-require-a-job-to-handle-messageboxes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| From bbae87dc1be3ae063796a582774bd5642cacdd5d Mon Sep 17 00:00:00 2001 | ||
| From: David Faure <faure@kde.org> | ||
| Date: Wed, 18 Jun 2014 20:29:04 +0200 | ||
| Subject: [PATCH 08/12] Don't require a job to handle messageboxes. | ||
|
|
||
| The POP3 ioslave doesn't have a job when it gets here. | ||
| --- | ||
| kio/kio/usernotificationhandler.cpp | 27 +++++++++++++-------------- | ||
| 1 file changed, 13 insertions(+), 14 deletions(-) | ||
|
|
||
| diff --git a/kio/kio/usernotificationhandler.cpp b/kio/kio/usernotificationhandler.cpp | ||
| index 10043cf..2b2e091 100644 | ||
| --- a/kio/kio/usernotificationhandler.cpp | ||
| +++ b/kio/kio/usernotificationhandler.cpp | ||
| @@ -19,7 +19,7 @@ | ||
| #include "usernotificationhandler_p.h" | ||
|
|
||
| #include "slave.h" | ||
| -#include "job_p.h" | ||
| +#include "jobuidelegate.h" | ||
|
|
||
| #include <kdebug.h> | ||
|
|
||
| @@ -76,19 +76,18 @@ void UserNotificationHandler::processRequest() | ||
|
|
||
| if (m_cachedResults.contains(key)) { | ||
| result = *(m_cachedResults[key]); | ||
| - } else if (r->slave->job()) { | ||
| - SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); | ||
| - if (jobPrivate) { | ||
| - result = jobPrivate->requestMessageBox(r->type, | ||
| - r->data.value(MSG_TEXT).toString(), | ||
| - r->data.value(MSG_CAPTION).toString(), | ||
| - r->data.value(MSG_YES_BUTTON_TEXT).toString(), | ||
| - r->data.value(MSG_NO_BUTTON_TEXT).toString(), | ||
| - r->data.value(MSG_YES_BUTTON_ICON).toString(), | ||
| - r->data.value(MSG_NO_BUTTON_ICON).toString(), | ||
| - r->data.value(MSG_DONT_ASK_AGAIN).toString(), | ||
| - r->data.value(MSG_META_DATA).toMap()); | ||
| - } | ||
| + } else { | ||
| + JobUiDelegate ui; | ||
| + const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type); | ||
| + result = ui.requestMessageBox(type, | ||
| + r->data.value(MSG_TEXT).toString(), | ||
| + r->data.value(MSG_CAPTION).toString(), | ||
| + r->data.value(MSG_YES_BUTTON_TEXT).toString(), | ||
| + r->data.value(MSG_NO_BUTTON_TEXT).toString(), | ||
| + r->data.value(MSG_YES_BUTTON_ICON).toString(), | ||
| + r->data.value(MSG_NO_BUTTON_ICON).toString(), | ||
| + r->data.value(MSG_DONT_ASK_AGAIN).toString(), | ||
| + r->data.value(MSG_META_DATA).toMap()); | ||
| m_cachedResults.insert(key, new int(result)); | ||
| } | ||
| } else { | ||
| -- | ||
| 1.8.3.1 | ||
|
|
22 changes: 22 additions & 0 deletions
22
kde/kdelibs/patches/changeset_r0ded2a069f270507a6c8020688582a47babbcc83.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| commit 0ded2a069f270507a6c8020688582a47babbcc83 | ||
| Author: David Faure <faure@kde.org> | ||
| Date: Wed Jun 18 20:29:53 2014 +0200 | ||
|
|
||
| Handle unexpected return values here (such as -1). | ||
|
|
||
| Patch by Jim Scadden, jims at silentasylum.co.uk | ||
|
|
||
| diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp | ||
| index 2af99bf..cdf28f0 100644 | ||
| --- a/kio/kio/tcpslavebase.cpp | ||
| +++ b/kio/kio/tcpslavebase.cpp | ||
| @@ -824,6 +824,9 @@ TCPSlaveBase::SslResult TCPSlaveBase::verifyServerCertificate() | ||
| messageBox(SSLMessageBox /*the SSL info dialog*/, d->host); | ||
| } else if (msgResult == KMessageBox::Cancel) { | ||
| return ResultFailed; | ||
| + } else if (msgResult != KMessageBox::No) { | ||
| + kWarning() << "Unexpected MessageBox response received:" << msgResult; | ||
| + return ResultFailed; | ||
| } | ||
| //fall through on KMessageBox::No | ||
| } while (msgResult == KMessageBox::Yes); |
70 changes: 70 additions & 0 deletions
70
kde/kdelibs/patches/changeset_r40e073c60f6cc8df1320460fbf94adae9e7b5254.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| commit 40e073c60f6cc8df1320460fbf94adae9e7b5254 | ||
| Author: Milian Wolff <mail@milianw.de> | ||
| Date: Wed Jun 18 13:27:50 2014 +0200 | ||
|
|
||
| Fix compile with giflib-5.1.0 and upwards. | ||
|
|
||
| See news about the giflib-5.1.0 release about the API break here: | ||
| http://fossies.org/linux/giflib/NEWS | ||
|
|
||
| REVIEW: 118811 | ||
|
|
||
| (cherry picked from commit 7c7a47575f1f57b5c0cc704826a5e5059939bbae) | ||
|
|
||
| diff --git a/khtml/imload/decoders/gifloader.cpp b/khtml/imload/decoders/gifloader.cpp | ||
| index 6c61ff5..09645a8 100644 | ||
| --- a/khtml/imload/decoders/gifloader.cpp | ||
| +++ b/khtml/imload/decoders/gifloader.cpp | ||
| @@ -52,6 +52,16 @@ extern "C" { | ||
|
|
||
| // #define DEBUG_GIFLOADER | ||
|
|
||
| +static void closeGif(GifFileType* file) | ||
| +{ | ||
| +#if GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) | ||
| + int errorCode; | ||
| + DGifCloseFile(file, &errorCode); | ||
| +#else | ||
| + DGifCloseFile(file); | ||
| +#endif | ||
| +} | ||
| + | ||
| namespace khtmlImLoad { | ||
|
|
||
| static int INTERLACED_OFFSET[] = { 0, 4, 2, 1 }; | ||
| @@ -369,7 +379,7 @@ public: | ||
|
|
||
| if (DGifSlurp(file) == GIF_ERROR) | ||
| { | ||
| - DGifCloseFile(file); | ||
| + closeGif(file); | ||
| return Error; | ||
| } | ||
|
|
||
| @@ -378,7 +388,7 @@ public: | ||
| if (file->ImageCount > 1) { | ||
| // Verify it.. | ||
| if (!ImageManager::isAcceptableSize(file->SWidth, file->SHeight)) { | ||
| - DGifCloseFile(file); | ||
| + closeGif(file); | ||
| return Error; | ||
| } | ||
| notifyImageInfo(file->SWidth, file->SHeight); | ||
| @@ -390,7 +400,7 @@ public: | ||
| //Extract colormap, geometry, so that we can create the frame | ||
| SavedImage* curFrame = &file->SavedImages[frame]; | ||
| if (!ImageManager::isAcceptableSize(curFrame->ImageDesc.Width, curFrame->ImageDesc.Height)) { | ||
| - DGifCloseFile(file); | ||
| + closeGif(file); | ||
| return Error; | ||
| } | ||
| } | ||
| @@ -576,7 +586,7 @@ public: | ||
| frame0->animProvider = new GIFAnimProvider(frame0, image, frameProps, bgColor); | ||
| } | ||
|
|
||
| - DGifCloseFile(file); | ||
| + closeGif(file); | ||
|
|
||
| return Done; | ||
| } |
Oops, something went wrong.