From 739eee9dc8fe4fd748093d7b53770c7b0e2e7a9b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 14 2015 23:13:26 +0000 Subject: 15.12.0 --- diff --git a/.gitignore b/.gitignore index 3f69dde..1d39dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/konsole-15.08.3.tar.xz +/konsole-15.12.0.tar.xz diff --git a/0011-Allow-user-to-select-where-the-scrollback-history-fi.patch b/0011-Allow-user-to-select-where-the-scrollback-history-fi.patch deleted file mode 100644 index 35e34cc..0000000 --- a/0011-Allow-user-to-select-where-the-scrollback-history-fi.patch +++ /dev/null @@ -1,421 +0,0 @@ -From a1957e8a8fb6662db4d7095254f9884b6b92229d Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Sun, 16 Aug 2015 13:32:36 -0400 -Subject: [PATCH 11/78] Allow user to select where the scrollback/history files - are written. - -Currently, when unlimited scrollback is used, the files are stored in -/tmp. As noted in the bug report, this can cause issues on some -distros. The default is still /tmp but the user can selected to use -a location in their $HOME folder (QStandardPaths::CacheLocation). - -This is somewhat a WIP. Allowing for the changes to take effect -immediately appears to be a gigantic mess to get to work. - -CCBUG: 173283 ---- - src/CMakeLists.txt | 2 + - src/History.cpp | 20 +++- - src/HistorySizeWidget.cpp | 4 +- - src/MainWindow.cpp | 6 ++ - src/settings/FileLocationSettings.cpp | 42 +++++++++ - src/settings/FileLocationSettings.h | 41 +++++++++ - src/settings/FileLocationSettings.ui | 166 ++++++++++++++++++++++++++++++++++ - src/settings/konsole.kcfg | 10 ++ - 8 files changed, 288 insertions(+), 3 deletions(-) - create mode 100644 src/settings/FileLocationSettings.cpp - create mode 100644 src/settings/FileLocationSettings.h - create mode 100644 src/settings/FileLocationSettings.ui - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2ff6f37..4c63df4 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -151,6 +151,7 @@ ki18n_wrap_ui(konsoleprivate_SRCS ColorSchemeEditor.ui - HistorySizeDialog.ui - HistorySizeWidget.ui - PrintOptions.ui -+ settings/FileLocationSettings.ui - settings/GeneralSettings.ui - settings/TabBarSettings.ui) - -@@ -169,6 +170,7 @@ set(konsole_KDEINIT_SRCS - Application.cpp - MainWindow.cpp - main.cpp -+ settings/FileLocationSettings.cpp - settings/GeneralSettings.cpp - settings/TabBarSettings.cpp) - -diff --git a/src/History.cpp b/src/History.cpp -index 5444fab..aac517b 100644 ---- a/src/History.cpp -+++ b/src/History.cpp -@@ -35,12 +35,16 @@ - #include - #include - #include -+#include -+#include - - // Reasonable line size - static const int LINE_SIZE = 1024; - - using namespace Konsole; - -+Q_GLOBAL_STATIC(QString, historyFileLocation); -+ - /* - An arbitrary long scroll. - -@@ -63,8 +67,20 @@ HistoryFile::HistoryFile() - _fileMap(0), - _readWriteBalance(0) - { -- const QString tmpDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); -- QDir().mkpath(tmpDir); -+ // Determine the temp directory once -+ // This class is called 3 times for each "unlimited" scrollback. -+ // This has the down-side that users must restart to -+ // load changes (currently only 2 choices). -+ if (!historyFileLocation.exists()) { -+ KConfigGroup configGroup(KSharedConfig::openConfig(), "FileLocation"); -+ if (configGroup.readEntry("scrollbackUseUsersHomeLocation", false)) { -+ *historyFileLocation() = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); -+ } else { -+ *historyFileLocation() = QDir::tempPath(); -+ } -+ QDir().mkpath(*historyFileLocation()); -+ } -+ const QString tmpDir = *historyFileLocation(); - const QString tmpFormat = tmpDir + QLatin1Char('/') + "konsole-XXXXXX.history"; - _tmpFile.setFileTemplate(tmpFormat); - if (_tmpFile.open()) { -diff --git a/src/HistorySizeWidget.cpp b/src/HistorySizeWidget.cpp -index e9af3a5..f75118a 100644 ---- a/src/HistorySizeWidget.cpp -+++ b/src/HistorySizeWidget.cpp -@@ -45,7 +45,9 @@ HistorySizeWidget::HistorySizeWidget(QWidget* parent) - _ui->unlimitedWarningWidget->setText(i18nc("@info:status", - "When using this option, the scrollback data will be written " - "unencrypted to temporary files. Those temporary files will be " -- "deleted automatically when Konsole is closed in a normal manner.")); -+ "deleted automatically when Konsole is closed in a normal manner.\n" -+ "Use Settings->Configure Konsole->File Location to select the " -+ "location of the temporary files.")); - - // focus and select the spinner automatically when appropriate - _ui->fixedSizeHistoryButton->setFocusProxy(_ui->historyLineSpinner); -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index f3a720e..af72eaa 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -56,6 +56,7 @@ - #include "ProfileManager.h" - #include "KonsoleSettings.h" - #include "WindowSystemInfo.h" -+#include "settings/FileLocationSettings.h" - #include "settings/GeneralSettings.h" - #include "settings/TabBarSettings.h" - -@@ -680,6 +681,11 @@ void MainWindow::showSettingsDialog() - i18nc("@title Preferences page name", "TabBar"), - "system-run"); - -+ FileLocationSettings* fileLocationSettings = new FileLocationSettings(settingsDialog); -+ settingsDialog->addPage(fileLocationSettings, -+ i18nc("@title Preferences page name", "File Location"), -+ "configure"); -+ - settingsDialog->show(); - } - -diff --git a/src/settings/FileLocationSettings.cpp b/src/settings/FileLocationSettings.cpp -new file mode 100644 -index 0000000..aab62c2 ---- /dev/null -+++ b/src/settings/FileLocationSettings.cpp -@@ -0,0 +1,42 @@ -+/* -+ Copyright 2015 Kurt Hindenburg -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2 of -+ the License or (at your option) version 3 or any later version -+ accepted by the membership of KDE e.V. (or its successor appro- -+ ved by the membership of KDE e.V.), which shall act as a proxy -+ defined in Section 14 of version 3 of the license. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see http://www.gnu.org/licenses/. -+*/ -+ -+// Own -+#include "FileLocationSettings.h" -+ -+#include -+#include -+ -+using namespace Konsole; -+ -+FileLocationSettings::FileLocationSettings(QWidget* aParent) : QWidget(aParent) -+{ -+ setupUi(this); -+ -+ // TODO: worth adding gauge on free disk space? -+ useSystemLocationText->setText(QDir::tempPath()); -+ useUsersHomeLocationText->setText(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)); -+ -+} -+ -+FileLocationSettings::~FileLocationSettings() -+{ -+} -+ -diff --git a/src/settings/FileLocationSettings.h b/src/settings/FileLocationSettings.h -new file mode 100644 -index 0000000..0b0d123 ---- /dev/null -+++ b/src/settings/FileLocationSettings.h -@@ -0,0 +1,41 @@ -+/* -+ Copyright 2015 Kurt Hindenburg -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2 of -+ the License or (at your option) version 3 or any later version -+ accepted by the membership of KDE e.V. (or its successor appro- -+ ved by the membership of KDE e.V.), which shall act as a proxy -+ defined in Section 14 of version 3 of the license. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see http://www.gnu.org/licenses/. -+*/ -+ -+#ifndef FILELOCATIONSETTINGS_H -+#define FILELOCATIONSETTINGS_H -+ -+#include "ui_FileLocationSettings.h" -+ -+namespace Konsole -+{ -+ -+class FileLocationSettings : public QWidget, private Ui::FileLocationSettings -+{ -+ Q_OBJECT -+ -+public: -+ explicit FileLocationSettings(QWidget* aParent = 0); -+ ~FileLocationSettings(); -+ -+}; -+ -+} -+ -+#endif -diff --git a/src/settings/FileLocationSettings.ui b/src/settings/FileLocationSettings.ui -new file mode 100644 -index 0000000..0984dda ---- /dev/null -+++ b/src/settings/FileLocationSettings.ui -@@ -0,0 +1,166 @@ -+ -+ -+ FileLocationSettings -+ -+ -+ -+ 0 -+ 0 -+ 494 -+ 354 -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ <b>Scrollback File Location</b><p>Use this groupbox to determine where Konsole will store the scrollback files.</p> -+ -+ -+ Scrollback File Location -+ -+ -+ -+ -+ -+ These settings only apply when Profile->Scrolling->Unlimited scrollback is selected. -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ Use system &location -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Horizontal -+ -+ -+ QSizePolicy::Fixed -+ -+ -+ -+ 50 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ Use user's ho&me location -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Horizontal -+ -+ -+ QSizePolicy::Fixed -+ -+ -+ -+ 50 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 10 -+ 75 -+ true -+ true -+ -+ -+ -+ QFrame::NoFrame -+ -+ -+ QFrame::Raised -+ -+ -+ For any changes to take effect, quit Konsole and restart. -+ -+ -+ Qt::AlignCenter -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Vertical -+ -+ -+ QSizePolicy::Expanding -+ -+ -+ -+ 20 -+ 50 -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/src/settings/konsole.kcfg b/src/settings/konsole.kcfg -index 1ba0e23..8cbb741 100644 ---- a/src/settings/konsole.kcfg -+++ b/src/settings/konsole.kcfg -@@ -89,4 +89,14 @@ - true - - -+ -+ -+ -+ true -+ -+ -+ -+ false -+ -+ - --- -2.5.0 - diff --git a/0018-Use-a-clearer-config-name-when-using-CacheLocation-f.patch b/0018-Use-a-clearer-config-name-when-using-CacheLocation-f.patch deleted file mode 100644 index 3e78fac..0000000 --- a/0018-Use-a-clearer-config-name-when-using-CacheLocation-f.patch +++ /dev/null @@ -1,66 +0,0 @@ -From ee640027c3a9ff7263d36c70e694fde035bb83b3 Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Sat, 29 Aug 2015 09:03:54 -0400 -Subject: [PATCH 18/78] Use a clearer config name when using ::CacheLocation - for scrollback - -s/scrollbackUseUsersHomeLocation/scrollbackUseCacheLocation/ ---- - src/History.cpp | 2 +- - src/settings/FileLocationSettings.ui | 4 ++-- - src/settings/konsole.kcfg | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/History.cpp b/src/History.cpp -index aac517b..d00b95a 100644 ---- a/src/History.cpp -+++ b/src/History.cpp -@@ -73,7 +73,7 @@ HistoryFile::HistoryFile() - // load changes (currently only 2 choices). - if (!historyFileLocation.exists()) { - KConfigGroup configGroup(KSharedConfig::openConfig(), "FileLocation"); -- if (configGroup.readEntry("scrollbackUseUsersHomeLocation", false)) { -+ if (configGroup.readEntry("scrollbackUseCacheLocation", false)) { - *historyFileLocation() = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); - } else { - *historyFileLocation() = QDir::tempPath(); -diff --git a/src/settings/FileLocationSettings.ui b/src/settings/FileLocationSettings.ui -index 0984dda..5d566dd 100644 ---- a/src/settings/FileLocationSettings.ui -+++ b/src/settings/FileLocationSettings.ui -@@ -74,7 +74,7 @@ - - - -- -+ - - - 0 -@@ -82,7 +82,7 @@ - - - -- Use user's ho&me location -+ Use user specific location - - - -diff --git a/src/settings/konsole.kcfg b/src/settings/konsole.kcfg -index 8cbb741..932a38c 100644 ---- a/src/settings/konsole.kcfg -+++ b/src/settings/konsole.kcfg -@@ -94,8 +94,8 @@ - - true - -- -- -+ -+ - false - - --- -2.5.0 - diff --git a/konsole-15.04.0-history_cache_instead_of_tmp.patch b/konsole-15.04.0-history_cache_instead_of_tmp.patch deleted file mode 100644 index b1cc603..0000000 --- a/konsole-15.04.0-history_cache_instead_of_tmp.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up konsole-15.04.0/src/History.cpp.tmp konsole-15.04.0/src/History.cpp ---- konsole-15.04.0/src/History.cpp.tmp 2015-03-28 14:16:01.000000000 -0500 -+++ konsole-15.04.0/src/History.cpp 2015-05-15 11:59:58.385218446 -0500 -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - // Reasonable line size - static const int LINE_SIZE = 1024; -@@ -62,7 +63,9 @@ HistoryFile::HistoryFile() - _fileMap(0), - _readWriteBalance(0) - { -- const QString tmpFormat = QDir::tempPath() + QLatin1Char('/') + "konsole-XXXXXX.history"; -+ const QString tmpDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); -+ QDir().mkpath(tmpDir); -+ const QString tmpFormat = tmpDir + QLatin1Char('/') + "konsole-XXXXXX.history"; - _tmpFile.setFileTemplate(tmpFormat); - if (_tmpFile.open()) { - _tmpFile.setAutoRemove(true); diff --git a/konsole-15.08.1-version.patch b/konsole-15.08.1-version.patch deleted file mode 100644 index ef92b48..0000000 --- a/konsole-15.08.1-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up konsole-15.08.1/CMakeLists.txt.version konsole-15.08.1/CMakeLists.txt ---- konsole-15.08.1/CMakeLists.txt.version 2015-08-25 09:55:12.000000000 -0500 -+++ konsole-15.08.1/CMakeLists.txt 2015-09-16 11:18:39.522848930 -0500 -@@ -2,7 +2,7 @@ - project(Konsole) - set(Konsole_VERSION_MAJOR 15) - set(Konsole_VERSION_MINOR 08) --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 0228afa..844858f 100644 --- a/konsole5.spec +++ b/konsole5.spec @@ -1,6 +1,6 @@ Name: konsole5 Summary: KDE Terminal emulator -Version: 15.08.3 +Version: 15.12.0 Release: 1%{?dist} # sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+ @@ -23,8 +23,6 @@ Patch50: konsole-15.04.0-history_cache_instead_of_tmp.patch Patch51: konsole-15.08.1-version.patch ## upstream patches -Patch111: 0011-Allow-user-to-select-where-the-scrollback-history-fi.patch -Patch118: 0018-Use-a-clearer-config-name-when-using-CacheLocation-f.patch ## downstream patches Patch200: konsole-history_location_default.patch @@ -83,10 +81,6 @@ Summary: Konsole5 kpart plugin %prep %setup -q -n konsole-%{version} -%patch50 -p1 -b .history_cache_instead_of_tmp -%patch51 -p1 -b .version -%patch111 -p1 -b .0011 -%patch118 -p1 -b .0018 %patch200 -p1 -b .history_location_default @@ -138,6 +132,9 @@ test "$(%{_target_platform}/src/konsole --version | grep ^Konsole | cut -d' ' -f %changelog +* Mon Dec 14 2015 Rex Dieter 15.12.0-1 +- 15.12.0 + * Thu Nov 12 2015 Rex Dieter - 15.08.3-1 - 15.08.3 - use %%license diff --git a/sources b/sources index fac2c29..eb3daf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d142d632695450674c52e73c1ccf58a konsole-15.08.3.tar.xz +4051b1535fb79632951f6dfbc3c2de6a konsole-15.12.0.tar.xz