Konsole output

diff --git a/.gitignore b/.gitignore index 187ccb4..6028f37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /konsole-15.04.1.tar.xz /konsole-15.04.2.tar.xz /konsole-15.04.3.tar.xz +/konsole-15.08.0.tar.xz diff --git a/0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch b/0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch deleted file mode 100644 index f05bbc9..0000000 --- a/0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 457d86d79a1496014b45a5bc6b14c23c4bdf4fa9 Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Sat, 8 Aug 2015 09:49:10 -0400 -Subject: [PATCH 1/3] Export HistoryScroll to fix compiling issue with gcc 5.2 - -REVIEW: 123881 -(cherry picked from commit 5f58169ba6fb18887b0e98aa390496df6fe8f242) ---- - src/History.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/History.h b/src/History.h -index 6314ef9..dcd3819 100644 ---- a/src/History.h -+++ b/src/History.h -@@ -83,7 +83,7 @@ private: - ////////////////////////////////////////////////////////////////////// - class HistoryType; - --class HistoryScroll -+class KONSOLEPRIVATE_EXPORT HistoryScroll - { - public: - explicit HistoryScroll(HistoryType*); --- -2.4.3 - diff --git a/0002-Revert-For-HTML-output-create-a-full-.html-file.patch b/0002-Revert-For-HTML-output-create-a-full-.html-file.patch deleted file mode 100644 index 19e7c3e..0000000 --- a/0002-Revert-For-HTML-output-create-a-full-.html-file.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f14e91b62f4b85ea145b2569d533bcaabc73a0ad Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Fri, 14 Aug 2015 21:48:28 -0400 -Subject: [PATCH 2/3] Revert "For HTML output, create a full .html file" - -This was meant when using File->Save Output->HTML. - -However, it has the side effect of making copy/paste Mime(HTML) output -a full HTML page. - -CCBUG: 343726 - -This reverts commit a4aa495c75bad7e2790899678a06fc714b086534. - -(cherry picked from commit 7d22259af621b0fc115e42f263ef5b6a3c7e1c9d) ---- - src/TerminalCharacterDecoder.cpp | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp -index 1c5fff4..d8e0253 100644 ---- a/src/TerminalCharacterDecoder.cpp -+++ b/src/TerminalCharacterDecoder.cpp -@@ -152,16 +152,6 @@ void HTMLDecoder::begin(QTextStream* output) - - QString text; - -- text.append("\n"); -- text.append("\n"); -- text.append("\n"); -- text.append("Konsole output\n"); -- text.append("\n"); -- text.append("\n"); -- text.append("\n"); -- text.append("

\n"); -- - //open monospace span - openSpan(text, "font-family:monospace"); - -@@ -175,9 +165,6 @@ void HTMLDecoder::end() - QString text; - - closeSpan(text); -- text.append("

\n"); -- text.append("\n"); -- text.append("\n"); - - *_output << text; - -@@ -275,7 +262,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP - } - - //start new line -- text.append("
"); -+ text.append("
"); - - *_output << text; - } --- -2.4.3 - diff --git a/0003-Actually-allow-File-Save-Output-As-HTML-to-work.patch b/0003-Actually-allow-File-Save-Output-As-HTML-to-work.patch deleted file mode 100644 index f7a87cf..0000000 --- a/0003-Actually-allow-File-Save-Output-As-HTML-to-work.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd414b9468b22bf3a44edb697020f4c1bd90282b Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Fri, 14 Aug 2015 22:04:56 -0400 -Subject: [PATCH 3/3] Actually allow File->Save Output As -> HTML to work - -(cherry picked from commit 0842acab6b448de49703006b5e4833bed172f170) ---- - src/SessionController.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/SessionController.cpp b/src/SessionController.cpp -index 20c56fb..8d2eaeb 100644 ---- a/src/SessionController.cpp -+++ b/src/SessionController.cpp -@@ -1716,10 +1716,11 @@ void SaveHistoryTask::execute() - // from. - // this is set to -1 to indicate the job has just been started - -- if ((dialog->mimeTypeFilters()).contains("text/html"), Qt::CaseInsensitive) -+ if ((dialog->selectedNameFilter()).contains("html", Qt::CaseInsensitive)) { - jobInfo.decoder = new HTMLDecoder(); -- else -+ } else { - jobInfo.decoder = new PlainTextDecoder(); -+ } - - _jobSession.insert(job, jobInfo); - --- -2.4.3 - diff --git a/konsole5.spec b/konsole5.spec index 7b5dcc9..6401e4e 100644 --- a/konsole5.spec +++ b/konsole5.spec @@ -1,7 +1,7 @@ Name: konsole5 Summary: KDE Terminal emulator -Version: 15.04.3 -Release: 2%{?dist} +Version: 15.08.0 +Release: 1%{?dist} # sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+ License: GPLv2 and GFDL @@ -25,9 +25,6 @@ Patch100: konsole-15.04.3-version.patch Patch50: konsole-15.04.0-history_cache_instead_of_tmp.patch ## upstream patches -Patch1: 0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch -Patch2: 0002-Revert-For-HTML-output-create-a-full-.html-file.patch -Patch3: 0003-Actually-allow-File-Save-Output-As-HTML-to-work.patch Obsoletes: konsole < 14.12 Provides: konsole = %{version}-%{release} @@ -81,9 +78,6 @@ Summary: Konsole5 kpart plugin %prep %setup -q -n konsole-%{version} -%patch1 -p1 -b .0001 -%patch2 -p1 -b .0002 -%patch3 -p1 -b .0003 %patch50 -p1 -b .history_cache_instead_of_tmp %patch100 -p1 -b .version @@ -134,6 +128,9 @@ test "$(%{_target_platform}/src/konsole --version | grep ^Konsole | cut -d' ' -f %changelog +* Wed Aug 26 2015 Daniel Vrátil - 15.08.0-1 +- 15.08.0 + * Sat Aug 15 2015 Rex Dieter - 15.04.3-2 - fix 'konsole --version' to match reality - backport copy-n-paste fixes (#1235024) diff --git a/sources b/sources index 86bc8e8..1a24c13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6075c8eaacc3f6dbc1c3c6b0a3090022 konsole-15.04.3.tar.xz +00d056cc45aa5ac06dde4f2796ac79ce konsole-15.08.0.tar.xz