Hello community,
here is the log from the commit of package konsole for openSUSE:Factory
checked in at Wed Sep 7 17:52:36 CEST 2011.
--------
--- konsole/konsole.changes 2011-07-22 20:25:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/konsole/konsole.changes 2011-09-07 14:48:34.000000000 +0200
@@ -1,0 +2,25 @@
+Sun Sep 4 17:03:57 UTC 2011 - ctrippe@opensuse.org
+
+- Set the name of the Root Shell profile in quotation marks
+ (bnc#715857)
+
+-------------------------------------------------------------------
+Thu Sep 1 23:23:56 CEST 2011 - dmueller@suse.de
+
+- update to 4.7.1
+ * Bugfixes over KDE 4.7.0
+ * see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for details
+
+-------------------------------------------------------------------
+Thu Aug 25 12:45:13 UTC 2011 - idonmez@novell.com
+
+- Add konsole-4.7-branch.patch: sync with 4.7 branch
+ * Fix argument list growing over time.
+ * Restore codec to profile setting or previous codec upon reset.
+ * Only enable the tab popup menu 'Detach Tab' for > 1 tabs.
+ * Fix $COLUMNS/$LINES after resizing.
+ * When loading profile, do not initially set default profile
+ as parent.
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_7_BRANCH.diff
konsole-4.7.0.tar.bz2
New:
----
konsole-4.7.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ konsole.spec ++++++
--- /var/tmp/diff_new_pack.HcHOks/_old 2011-09-07 17:52:30.000000000 +0200
+++ /var/tmp/diff_new_pack.HcHOks/_new 2011-09-07 17:52:30.000000000 +0200
@@ -18,16 +18,13 @@
Name: konsole
-BuildRequires: libkde4-devel
-BuildRequires: libxklavier-devel
-BuildRequires: fdupes
+Version: 4.7.1
+Release: 1
License: GPLv2+
-Group: System/X11/Terminals
Summary: KDE Terminal
Url: http://www.kde.org/
-Version: 4.7.0
-Release: 1
-Source0: konsole-%version.tar.bz2
+Group: System/X11/Terminals
+Source0: konsole-%{version}.tar.bz2
Source4: konsolesu.desktop
Source21: utilities-terminal-su-16.png
Source22: utilities-terminal-su-22.png
@@ -35,22 +32,17 @@
Source24: utilities-terminal-su-48.png
Source25: utilities-terminal-su-64.png
Source26: utilities-terminal-su-128.png
+BuildRequires: fdupes
+BuildRequires: libkde4-devel
+BuildRequires: pkgconfig(libxklavier)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch: 4_7_BRANCH.diff
%kde4_runtime_requires
%description
Konsole is a terminal emulator for the K Desktop Environment.
-
-
-Authors:
---------
- The KDE Team
-
%prep
-%setup -q -n konsole-%version
-%patch
+%setup -q -n konsole-%{version}
%build
%cmake_kde4 -d build
@@ -58,24 +50,25 @@
%install
pushd build
- %makeinstall
+%make_install
popd
- install -D -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/kde4/
- install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/utilities-terminal_su.png
- install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/utilities-terminal_su.png
- install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/utilities-terminal_su.png
- install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/utilities-terminal_su.png
- install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/utilities-terminal_su.png
- install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/utilities-terminal_su.png
+ install -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications/kde4/
+ install -D -m 0644 %{SOURCE21} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/utilities-terminal_su.png
+ install -D -m 0644 %{SOURCE22} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/utilities-terminal_su.png
+ install -D -m 0644 %{SOURCE23} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/utilities-terminal_su.png
+ install -D -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/utilities-terminal_su.png
+ install -D -m 0644 %{SOURCE25} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/utilities-terminal_su.png
+ install -D -m 0644 %{SOURCE26} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/utilities-terminal_su.png
%suse_update_desktop_file konsole TerminalEmulator
- %fdupes -s $RPM_BUILD_ROOT %kde_post_install
+ %fdupes -s %{buildroot}
+ %kde_post_install
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
- rm -rf $RPM_BUILD_ROOT
+ rm -rf %{buildroot}
%files
%defattr(-,root,root)
++++++ konsole-4.7.0.tar.bz2 -> konsole-4.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/CMakeLists.txt new/konsole-4.7.1/CMakeLists.txt
--- old/konsole-4.7.0/CMakeLists.txt 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/CMakeLists.txt 2011-09-01 22:47:37.000000000 +0200
@@ -15,3 +15,4 @@
add_subdirectory( desktop )
add_subdirectory( doc/manual )
+macro_display_feature_log()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/desktop/konsole.notifyrc new/konsole-4.7.1/desktop/konsole.notifyrc
--- old/konsole-4.7.0/desktop/konsole.notifyrc 2011-07-19 23:34:45.000000000 +0200
+++ new/konsole-4.7.1/desktop/konsole.notifyrc 2011-09-01 22:47:37.000000000 +0200
@@ -895,7 +895,7 @@
Comment[kn]=ಶೂನ್ಯವಲ್ಲದ (ನಾನ್ ಜೀರೋ) ಸ್ಥಿತಿಗತಿಯೊಂದಿಗೆ ಒಂದು ಅಧಿವೇಶನ (ಸೆಶನ್) ನಿರ್ಗಮಿಸಿದೆ
Comment[ko]=세션이 0이 아닌 상태로 끝났음
Comment[ku]=Danişîneke ku bi rewşa ne-sifir derketiye
-Comment[lt]=Sesija baigė darbą su nenuliniu rėžimu
+Comment[lt]=Sesija baigė darbą su nenuliniu režimu
Comment[lv]=Sesija beidzās ar nenulles statusu
Comment[mai]=सत्र नॉन जीरो स्थितिक संग बाहर भेल
Comment[mk]=Сесијата излезе со ненулти статус
Files old/konsole-4.7.0/doc/manual/index.cache.bz2 and new/konsole-4.7.1/doc/manual/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/Part.cpp new/konsole-4.7.1/src/Part.cpp
--- old/konsole-4.7.0/src/Part.cpp 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/Part.cpp 2011-08-22 15:24:44.000000000 +0200
@@ -304,4 +304,44 @@
return true;
}
+void Part::setMonitorSilenceEnabled(bool enabled)
+{
+ Q_ASSERT( activeSession() );
+
+ if (enabled)
+ {
+ activeSession()->setMonitorSilence(true);
+ connect(activeSession(), SIGNAL(stateChanged(int)), this, SLOT(sessionStateChanged(int)), Qt::UniqueConnection);
+ }
+ else
+ {
+ activeSession()->setMonitorSilence(false);
+ disconnect(activeSession(), SIGNAL(stateChanged(int)), this, SLOT(sessionStateChanged(int)));
+ }
+}
+
+void Part::setMonitorActivityEnabled(bool enabled)
+{
+ Q_ASSERT( activeSession() );
+
+ if (enabled)
+ {
+ activeSession()->setMonitorActivity(true);
+ connect(activeSession(), SIGNAL(stateChanged(int)), this, SLOT(sessionStateChanged(int)), Qt::UniqueConnection);
+ }
+ else
+ {
+ activeSession()->setMonitorActivity(false);
+ disconnect(activeSession(), SIGNAL(stateChanged(int)), this, SLOT(sessionStateChanged(int)));
+ }
+}
+
+void Part::sessionStateChanged(int state)
+{
+ if (state == NOTIFYSILENCE)
+ emit silenceDetected();
+ else if (state == NOTIFYACTIVITY)
+ emit activityDetected();
+}
+
#include "Part.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/Part.h new/konsole-4.7.1/src/Part.h
--- old/konsole-4.7.0/src/Part.h 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/Part.h 2011-08-22 15:24:44.000000000 +0200
@@ -110,6 +110,22 @@
*/
void openTeletype(int ptyMasterFd);
+ /**
+ * Toggles monitoring for silence in the active session. If silence is detected,
+ * the silenceDetected() signal is emitted.
+ *
+ * @param enabled Whether to enable or disable monitoring for silence.
+ * */
+ void setMonitorSilenceEnabled(bool enabled);
+
+ /**
+ * Toggles monitoring for activity in the active session. If activity is detected,
+ * the activityDetected() signal is emitted.
+ *
+ * @param enabled Whether to enable or disable monitoring for activity.
+ * */
+ void setMonitorActivityEnabled(bool enabled);
+
signals:
/**
* Emitted when the key sequence for a shortcut, which is also a valid terminal key sequence,
@@ -130,6 +146,18 @@
*/
void overrideShortcut(QKeyEvent* event, bool& override);
+ /**
+ * Emitted when silence has been detected in the active session. Monitoring
+ * for silence has to be enabled first using setMonitorSilenceEnabled().
+ */
+ void silenceDetected();
+
+ /**
+ * Emitted when activity has been detected in the active session. Monitoring
+ * for activity has to be enabled first using setMonitorActivityEnabled().
+ */
+ void activityDetected();
+
protected:
/** Reimplemented from KParts::PartBase. */
virtual bool openFile();
@@ -145,6 +173,7 @@
void terminalExited();
void newTab();
void overrideTerminalShortcut(QKeyEvent*,bool& override);
+ void sessionStateChanged(int state);
private:
Session* activeSession() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/ProcessInfo.cpp new/konsole-4.7.1/src/ProcessInfo.cpp
--- old/konsole-4.7.0/src/ProcessInfo.cpp 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/ProcessInfo.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -338,6 +338,11 @@
_arguments << argument;
}
+void ProcessInfo::clearArguments()
+{
+ _arguments.clear();
+}
+
void ProcessInfo::addEnvironmentBinding(const QString& name , const QString& value)
{
_environment.insert(name,value);
@@ -384,6 +389,10 @@
bool UnixProcessInfo::readProcessInfo(int pid , bool enableEnvironmentRead)
{
+ // prevent _arguments from growing longer and longer each time this
+ // method is called.
+ clearArguments();
+
bool ok = readProcInfo(pid);
if (ok)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/ProcessInfo.h new/konsole-4.7.1/src/ProcessInfo.h
--- old/konsole-4.7.0/src/ProcessInfo.h 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/ProcessInfo.h 2011-09-01 22:47:37.000000000 +0200
@@ -265,6 +265,13 @@
* by arguments()
*/
void addArgument(const QString& argument);
+
+ /**
+ * clear the commandline arguments for the process, as returned
+ * by arguments()
+ */
+ void clearArguments();
+
/**
* Adds an environment binding for the process, as returned by
* environment()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/SessionController.cpp new/konsole-4.7.1/src/SessionController.cpp
--- old/konsole-4.7.0/src/SessionController.cpp 2011-06-22 16:52:04.000000000 +0200
+++ new/konsole-4.7.1/src/SessionController.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -1006,9 +1006,13 @@
void SessionController::clearHistoryAndReset()
{
+ Profile::Ptr profile = SessionManager::instance()->sessionProfile(_session);
+ QByteArray name = profile->property<QString>(Profile::DefaultEncoding).toUtf8();
+
Emulation* emulation = _session->emulation();
emulation->reset();
_session->refresh();
+ _session->setCodec(QTextCodec::codecForName(name));
clearHistory();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/SessionManager.cpp new/konsole-4.7.1/src/SessionManager.cpp
--- old/konsole-4.7.0/src/SessionManager.cpp 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/SessionManager.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -181,7 +181,7 @@
return Profile::Ptr();
}
- Profile::Ptr newProfile = Profile::Ptr(new Profile(defaultProfile()));
+ Profile::Ptr newProfile = Profile::Ptr(new Profile(fallbackProfile()));
newProfile->setProperty(Profile::Path,path);
QString parentProfilePath;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/TerminalDisplay.cpp new/konsole-4.7.1/src/TerminalDisplay.cpp
--- old/konsole-4.7.0/src/TerminalDisplay.cpp 2011-06-22 16:52:04.000000000 +0200
+++ new/konsole-4.7.1/src/TerminalDisplay.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -2784,8 +2784,15 @@
void TerminalDisplay::dragEnterEvent(QDragEnterEvent* event)
{
- if (event->mimeData()->hasFormat("text/plain"))
+ // text/plain alone is enough for KDE-apps
+ // text/uri-list is for supporting some non-KDE apps, such as thunar
+ // and pcmanfm
+ // That also applies in dropEvent()
+ if (event->mimeData()->hasFormat("text/plain") ||
+ event->mimeData()->hasFormat("text/uri-list"))
+ {
event->acceptProposedAction();
+ }
}
void TerminalDisplay::dropEvent(QDropEvent* event)
@@ -2820,7 +2827,8 @@
dropText = event->mimeData()->text();
}
- if(event->mimeData()->hasFormat("text/plain"))
+ if (event->mimeData()->hasFormat("text/plain") ||
+ event->mimeData()->hasFormat("text/uri-list"))
{
emit sendStringToEmu(dropText.toLocal8Bit());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/ViewContainer.cpp new/konsole-4.7.1/src/ViewContainer.cpp
--- old/konsole-4.7.0/src/ViewContainer.cpp 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/ViewContainer.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -665,6 +665,13 @@
{
_contextMenuTabIndex = index;
+ // Enable 'Detach Tab' menu item only if there is more than 1 tab
+ QList menuActions = _contextPopupMenu->actions();
+ if (_tabBar->count() == 1)
+ menuActions.first()->setEnabled(false);
+ else
+ menuActions.first()->setEnabled(true);
+
_contextPopupMenu->exec(pos);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/Vt102Emulation.cpp new/konsole-4.7.1/src/Vt102Emulation.cpp
--- old/konsole-4.7.0/src/Vt102Emulation.cpp 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/Vt102Emulation.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -81,13 +81,21 @@
void Vt102Emulation::reset()
{
+ // Save the current codec so we can set it later.
+ // Ideally we would want to use the profile setting
+ const QTextCodec* currentCodec = codec();
+
resetTokenizer();
resetModes();
resetCharset(0);
_screen[0]->reset();
resetCharset(1);
_screen[1]->reset();
- setCodec(LocaleCodec);
+
+ if (currentCodec)
+ setCodec(currentCodec);
+ else
+ setCodec(LocaleCodec);
bufferedUpdate();
}
@@ -532,7 +540,7 @@
case TY_ESC_DE('8' ) : _currentScreen->helpAlign ( ); break;
// resize = \e[8;<row>;<col>t
- case TY_CSI_PS('t', 8) : setImageSize( q /* columns */, p /* lines */ ); break;
+ case TY_CSI_PS('t', 8) : setImageSize( p /*lines */, q /* columns */ ); break;
// change tab text color : \e[28;<color>t color: 0-16,777,215
case TY_CSI_PS('t', 28) : emit changeTabTextColorRequest ( p ); break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.7.0/src/main.cpp new/konsole-4.7.1/src/main.cpp
--- old/konsole-4.7.0/src/main.cpp 2011-05-21 01:08:13.000000000 +0200
+++ new/konsole-4.7.1/src/main.cpp 2011-09-01 22:47:37.000000000 +0200
@@ -30,7 +30,7 @@
#include <KCmdLineArgs>
#include <KLocale>
-#define KONSOLE_VERSION "2.7"
+#define KONSOLE_VERSION "2.7.1"
using namespace Konsole;
++++++ konsolesu.desktop ++++++
--- /var/tmp/diff_new_pack.HcHOks/_old 2011-09-07 17:52:30.000000000 +0200
+++ /var/tmp/diff_new_pack.HcHOks/_new 2011-09-07 17:52:30.000000000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=konsole --profile Root\ Shell
+Exec=konsole --profile "Root Shell"
Icon=utilities-terminal_su
X-DocPath=konsole/index.html
Terminal=false
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org