From 3d84707ff71678732136b7387d409642da5066df Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 15 2015 15:42:21 +0000 Subject: 15.04.3-2 - fix 'konsole --version' to match reality - backport copy-n-paste fixes (#1235024) --- diff --git a/0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch b/0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch new file mode 100644 index 0000000..f05bbc9 --- /dev/null +++ b/0001-Export-HistoryScroll-to-fix-compiling-issue-with-gcc.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..19e7c3e --- /dev/null +++ b/0002-Revert-For-HTML-output-create-a-full-.html-file.patch @@ -0,0 +1,62 @@ +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 new file mode 100644 index 0000000..f7a87cf --- /dev/null +++ b/0003-Actually-allow-File-Save-Output-As-HTML-to-work.patch @@ -0,0 +1,31 @@ +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/konsole-15.04.3-version.patch b/konsole-15.04.3-version.patch new file mode 100644 index 0000000..161180e --- /dev/null +++ b/konsole-15.04.3-version.patch @@ -0,0 +1,12 @@ +diff -up konsole-15.04.3/CMakeLists.txt.version konsole-15.04.3/CMakeLists.txt +--- konsole-15.04.3/CMakeLists.txt.version 2015-05-30 06:45:09.000000000 -0500 ++++ konsole-15.04.3/CMakeLists.txt 2015-08-15 10:38:10.010564010 -0500 +@@ -2,7 +2,7 @@ + project(Konsole) + set(Konsole_VERSION_MAJOR 15) + set(Konsole_VERSION_MINOR 04) +-set(Konsole_VERSION_PATCH 0) ++set(Konsole_VERSION_PATCH 3) + set(Konsole_VERSION "${Konsole_VERSION_MAJOR}.${Konsole_VERSION_MINOR}.${Konsole_VERSION_PATCH}") + + # minimal requirements diff --git a/konsole5.spec b/konsole5.spec index 0547fa0..c6e2d79 100644 --- a/konsole5.spec +++ b/konsole5.spec @@ -1,7 +1,7 @@ Name: konsole5 Summary: KDE Terminal emulator Version: 15.04.3 -Release: 1%{?dist} +Release: 2%{?dist} # sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+ License: GPLv2 and GFDL @@ -14,9 +14,20 @@ URL: http://konsole.kde.org/ %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/konsole-%{version}.tar.xz +## downstream patches +# fixed in newer versions, can drop when rebasing. -- rex +Patch100: konsole-15.04.3-version.patch + ## upstreamable patches # https://bugs.kde.org/show_bug.cgi?id=173283 -Patch1: konsole-15.04.0-history_cache_instead_of_tmp.patch +# (kinda) upstreamed, though there seems to be some objections, so may +# end up getting reverted at some point. -- rex +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} @@ -70,7 +81,10 @@ Summary: Konsole5 kpart plugin %prep %setup -q -n konsole-%{version} -%patch1 -p1 -b .history_cache_instead_of_tmp +%patch1 -p1 -b .0001 +%patch2 -p1 -b .0002 +%patch3 -p1 -b .0003 +%patch50 -p1 -b .history_cache_instead_of_tmp %build @@ -88,6 +102,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %check desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.konsole.desktop +test "$(%{_target_platform}/src/konsole --version | grep ^Konsole | cut -d' ' -f2)" = "%{version}" %files @@ -118,6 +133,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.konsole.d %changelog +* Sat Aug 15 2015 Rex Dieter - 15.04.3-2 +- fix 'konsole --version' to match reality +- backport copy-n-paste fixes (#1235024) + * Tue Jun 30 2015 Rex Dieter - 15.04.3-1 - 15.04.3