[SCM] kcoreaddons packaging branch, master, updated. debian/5.37.0-2-101-ga15783a
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:34:32 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=e53d071
The following commit has been merged in the master branch:
commit e53d071777c631dba59e054a3491bbd8d3fb80ed
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Jun 29 14:22:30 2017 +0100
remove patches in archive
---
...-343275-1-added-at-the-end-of-a-hyperlink.patch | 57 ----------------
...nsafe-characters-incorrectly-parsed-as-pa.patch | 43 -------------
.../KDirWatch-fix-memory-leak-on-destruction.patch | 75 ----------------------
debian/patches/series | 3 -
4 files changed, 178 deletions(-)
diff --git a/debian/patches/Fix-Bug-343275-1-added-at-the-end-of-a-hyperlink.patch b/debian/patches/Fix-Bug-343275-1-added-at-the-end-of-a-hyperlink.patch
deleted file mode 100644
index bb47d86..0000000
--- a/debian/patches/Fix-Bug-343275-1-added-at-the-end-of-a-hyperlink.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Montel Laurent <montel at kde.org>
-Date: Wed, 23 Nov 2016 08:07:25 +0100
-Subject: Fix Bug 343275 - [1] added at the end of a hyperlink
-
-FIXED-IN: 5.29
-BUG: 343275
----
- autotests/ktexttohtmltest.cpp | 5 +++++
- src/lib/text/ktexttohtml.cpp | 6 ++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/autotests/ktexttohtmltest.cpp b/autotests/ktexttohtmltest.cpp
-index ccac29a..f48a31c 100644
---- a/autotests/ktexttohtmltest.cpp
-+++ b/autotests/ktexttohtmltest.cpp
-@@ -411,6 +411,11 @@ void KTextToHTMLTest::testHtmlConvert_data()
- QTest::newRow("url-exec-html-6") << "https://<IP>:/\"><script>alert(1);</script><!--
Test2"
- << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
- << "https://<IP>:/"><script>alert(1);</script><!--
Test2";
-+
-+
-+ QTest::newRow("url-with-ref-in-[") << "https://www.kde.org[1]"
-+ << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
-+ << "<a href=\"https://www.kde.org\">https://www.kde.org</a>[1]";
- }
-
-
-diff --git a/src/lib/text/ktexttohtml.cpp b/src/lib/text/ktexttohtml.cpp
-index 30e0b5d..ecc1d22 100644
---- a/src/lib/text/ktexttohtml.cpp
-+++ b/src/lib/text/ktexttohtml.cpp
-@@ -229,12 +229,15 @@ QString KTextToHTMLHelper::getUrl(bool *badurl)
- int start = mPos;
- bool previousCharIsSpace = false;
- bool previousCharIsADoubleQuote = false;
-+ bool previousIsAnAnchor = false;
- while ((mPos < mText.length()) &&
- (mText[mPos].isPrint() || mText[mPos].isSpace()) &&
- ((afterUrl.isNull() && !mText[mPos].isSpace()) ||
- (!afterUrl.isNull() && mText[mPos] != afterUrl))) {
- if (mText[mPos].isSpace()) {
- previousCharIsSpace = true;
-+ } else if (!previousIsAnAnchor && mText[mPos] == QLatin1Char('[')) {
-+ break;
- } else { // skip whitespace
- if (previousCharIsSpace && mText[mPos] == QLatin1Char('<')) {
- url.append(QLatin1Char(' '));
-@@ -253,6 +256,9 @@ QString KTextToHTMLHelper::getUrl(bool *badurl)
- } else {
- previousCharIsADoubleQuote = false;
- }
-+ if (mText[mPos] == QLatin1Char('#')) {
-+ previousIsAnAnchor = true;
-+ }
- url.append(mText[mPos]);
- if (url.length() > mMaxUrlLen) {
- break;
diff --git a/debian/patches/Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch b/debian/patches/Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch
deleted file mode 100644
index 8b5af89..0000000
--- a/debian/patches/Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Montel Laurent <montel at kde.org>
-Date: Tue, 17 Jan 2017 07:41:53 +0100
-Subject: Fix Bug 363427 - unsafe characters incorrectly parsed as part of URL
-
-Fix [Please visit our booth 24-25 http://example.com/]
-CCBUG:363427
----
- autotests/ktexttohtmltest.cpp | 8 ++++++++
- src/lib/text/ktexttohtml.cpp | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/autotests/ktexttohtmltest.cpp b/autotests/ktexttohtmltest.cpp
-index f48a31c..0c14623 100644
---- a/autotests/ktexttohtmltest.cpp
-+++ b/autotests/ktexttohtmltest.cpp
-@@ -416,6 +416,14 @@ void KTextToHTMLTest::testHtmlConvert_data()
- QTest::newRow("url-with-ref-in-[") << "https://www.kde.org[1]"
- << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
- << "<a href=\"https://www.kde.org\">https://www.kde.org</a>[1]";
-+
-+ QTest::newRow("url-with-ref-in-[2") << "[http://www.example.org/][whatever]"
-+ << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
-+ << "[<a href=\"http://www.example.org/\">http://www.example.org/</a>][whatever]";
-+
-+ QTest::newRow("url-with-ref-in-]") << "[Please visit our booth 24-25 http://example.com/]"
-+ << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
-+ << "[Please visit our booth 24-25 <a href=\"http://example.com/\">http://example.com/</a>]";
- }
-
-
-diff --git a/src/lib/text/ktexttohtml.cpp b/src/lib/text/ktexttohtml.cpp
-index ecc1d22..d6c1f1c 100644
---- a/src/lib/text/ktexttohtml.cpp
-+++ b/src/lib/text/ktexttohtml.cpp
-@@ -238,6 +238,8 @@ QString KTextToHTMLHelper::getUrl(bool *badurl)
- previousCharIsSpace = true;
- } else if (!previousIsAnAnchor && mText[mPos] == QLatin1Char('[')) {
- break;
-+ } else if (!previousIsAnAnchor && mText[mPos] == QLatin1Char(']')) {
-+ break;
- } else { // skip whitespace
- if (previousCharIsSpace && mText[mPos] == QLatin1Char('<')) {
- url.append(QLatin1Char(' '));
diff --git a/debian/patches/KDirWatch-fix-memory-leak-on-destruction.patch b/debian/patches/KDirWatch-fix-memory-leak-on-destruction.patch
deleted file mode 100644
index 2624c04..0000000
--- a/debian/patches/KDirWatch-fix-memory-leak-on-destruction.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: David Faure <faure at kde.org>
-Date: Sun, 5 Feb 2017 11:49:07 +0100
-Subject: KDirWatch: fix memory leak on destruction.
-
-Summary:
-The Entry class owns the Client instances, so it should delete the
-remaining instances in its destructor, for the case where they haven't
-been removed one by one. The line of code removeEntries(nullptr) was
-probably means to remove them one by one, but it was a no-op (the code
-for that method doesn't expect nullptr as argument) and it would be
-slow anyway. We don't need to call inotify_remove for every path,
-when we're just cleaning up in a global static after qApp destruction.
-
-Detected by a clang-sanitizer build on http://ci-logs.kde.flaska.net
-and reproduced locally with valgrind.
-
-Test Plan:
-./kdirwatch_*_unittest now passes in valgrind without memory
-leaks being reported
-
-Reviewers: aacid, mpyne
-
-Reviewed By: aacid, mpyne
-
-Subscribers: markg, #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D4439
----
- src/lib/io/kdirwatch.cpp | 8 +++++---
- src/lib/io/kdirwatch_p.h | 3 ++-
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/lib/io/kdirwatch.cpp b/src/lib/io/kdirwatch.cpp
-index 241aeec..99da809 100644
---- a/src/lib/io/kdirwatch.cpp
-+++ b/src/lib/io/kdirwatch.cpp
-@@ -244,9 +244,6 @@ KDirWatchPrivate::~KDirWatchPrivate()
- {
- timer.stop();
-
-- /* remove all entries being watched */
-- removeEntries(0);
--
- #if HAVE_FAM
- if (use_fam && sn) {
- FAMClose(&fc);
-@@ -452,6 +449,11 @@ void KDirWatchPrivate::inotifyEventReceived()
- #endif
- }
-
-+KDirWatchPrivate::Entry::~Entry()
-+{
-+ qDeleteAll(m_clients);
-+}
-+
- /* In FAM mode, only entries which are marked dirty are scanned.
- * We first need to mark all yet nonexistent, but possible created
- * entries as dirty...
-diff --git a/src/lib/io/kdirwatch_p.h b/src/lib/io/kdirwatch_p.h
-index 8a7da91..33e2404 100644
---- a/src/lib/io/kdirwatch_p.h
-+++ b/src/lib/io/kdirwatch_p.h
-@@ -83,8 +83,9 @@ public:
- class Entry
- {
- public:
-+ ~Entry();
- // instances interested in events
-- QList<Client *> m_clients;
-+ QList<Client *> m_clients; // owned by Entry
- // nonexistent entries of this directory
- QList<Entry *> m_entries;
- QString path;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 645e7f8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix-Bug-343275-1-added-at-the-end-of-a-hyperlink.patch
-Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch
-KDirWatch-fix-memory-leak-on-destruction.patch
--
kcoreaddons packaging
More information about the pkg-kde-commits
mailing list