Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2013-12-11 14:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2013-12-02 12:31:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2013-12-11 14:32:49.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 29 07:01:36 UTC 2013 - [email protected] + +- Update to 4.11.97 + * KDE 4.12 RC 1 release + * See http://www.kde.org/announcements/announce-4.12-rc.php + +------------------------------------------------------------------- +Sat Nov 23 22:16:20 UTC 2013 - [email protected] + +- Update to 4.11.95 + * KDE 4.12 Beta 3 release + * See http://www.kde.org/announcements/announce-4.12-beta3.php + +------------------------------------------------------------------- Old: ---- konsole-4.11.90.tar.xz New: ---- konsole-4.11.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.0FY2gi/_old 2013-12-11 14:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.0FY2gi/_new 2013-12-11 14:32:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: konsole -Version: 4.11.90 +Version: 4.11.97 Release: 0 Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-4.11.90.tar.xz -> konsole-4.11.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/MainWindow.cpp new/konsole-4.11.97/src/MainWindow.cpp --- old/konsole-4.11.90/src/MainWindow.cpp 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/MainWindow.cpp 2013-11-27 20:10:27.000000000 +0100 @@ -535,6 +535,10 @@ const QString defaultProc = session->program().split('/').last(); const QString currentProc = session->foregroundProcessName().split('/').last(); + + if (currentProc.isEmpty()) + continue; + if (defaultProc != currentProc) { processesRunning.append(currentProc); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/ProcessInfo.cpp new/konsole-4.11.97/src/ProcessInfo.cpp --- old/konsole-4.11.90/src/ProcessInfo.cpp 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/ProcessInfo.cpp 2013-11-27 20:10:27.000000000 +0100 @@ -363,6 +363,7 @@ { } +#if !defined(Q_OS_WIN) UnixProcessInfo::UnixProcessInfo(int aPid, bool enableEnvironmentRead) : ProcessInfo(aPid, enableEnvironmentRead) { @@ -413,6 +414,7 @@ } delete [] getpwBuffer; } +#endif #if defined(Q_OS_LINUX) class LinuxProcessInfo : public UnixProcessInfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/ProcessInfo.h new/konsole-4.11.97/src/ProcessInfo.h --- old/konsole-4.11.90/src/ProcessInfo.h 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/ProcessInfo.h 2013-11-27 20:10:27.000000000 +0100 @@ -346,6 +346,7 @@ virtual void readUserName(void); }; +#if !defined(Q_OS_WIN) /** * Implementation of ProcessInfo for Unix platforms which uses * the /proc filesystem @@ -397,6 +398,7 @@ */ virtual bool readCurrentDir(int pid) = 0; }; +#endif /** * Lightweight class which provides additional information about SSH processes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/ProfileList.cpp new/konsole-4.11.97/src/ProfileList.cpp --- old/konsole-4.11.90/src/ProfileList.cpp 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/ProfileList.cpp 2013-11-27 20:10:27.000000000 +0100 @@ -32,6 +32,7 @@ // Konsole #include "ProfileManager.h" +using Konsole::Profile; using Konsole::ProfileList; ProfileList::ProfileList(bool addShortcuts , QObject* parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/Session.cpp new/konsole-4.11.97/src/Session.cpp --- old/konsole-4.11.90/src/Session.cpp 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/Session.cpp 2013-11-27 20:10:27.000000000 +0100 @@ -441,7 +441,12 @@ const int CHOICE_COUNT = 3; // if '_program' is empty , fall back to default shell. If that is not set // then fall back to /bin/sh +#ifndef _WIN32 QString programs[CHOICE_COUNT] = {_program, qgetenv("SHELL"), "/bin/sh"}; +#else + // on windows, fall back to %COMSPEC% or to cmd.exe + QString programs[CHOICE_COUNT] = {_program, qgetenv("COMSPEC"), "cmd.exe"}; +#endif QString exec; int choice = 0; while (choice < CHOICE_COUNT) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/TerminalDisplay.cpp new/konsole-4.11.97/src/TerminalDisplay.cpp --- old/konsole-4.11.90/src/TerminalDisplay.cpp 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/TerminalDisplay.cpp 2013-11-27 20:10:27.000000000 +0100 @@ -1987,7 +1987,7 @@ update(_mouseOverHotspotArea | previousHotspotArea); } } else if (!_mouseOverHotspotArea.isEmpty()) { - if (_underlineLinks && (_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier))) + if ((_underlineLinks && (_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier))) || (cursor().shape() == Qt::PointingHandCursor)) setCursor(_mouseMarks ? Qt::IBeamCursor : Qt::ArrowCursor); update(_mouseOverHotspotArea); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.90/src/tests/CMakeLists.txt new/konsole-4.11.97/src/tests/CMakeLists.txt --- old/konsole-4.11.90/src/tests/CMakeLists.txt 2013-11-10 00:26:30.000000000 +0100 +++ new/konsole-4.11.97/src/tests/CMakeLists.txt 2013-11-27 20:10:27.000000000 +0100 @@ -8,10 +8,12 @@ ## If it's interactive, it shouldn't use kde4_add_unit_test, ## since make test is supposed to be fully automated. +if(NOT WIN32) kde4_add_executable(PartManualTest TEST PartManualTest.cpp) target_link_libraries(PartManualTest ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${KONSOLE_TEST_LIBS}) +endif() kde4_add_unit_test(CharacterColorTest CharacterColorTest.cpp) target_link_libraries(CharacterColorTest ${KONSOLE_TEST_LIBS}) @@ -21,14 +23,16 @@ target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS}) endif() -kde4_add_unit_test(HistoryTest HistoryTest.cpp) +kde4_add_unit_test(HistoryTest HistoryTest.cpp ../History.cpp) +set_target_properties(HistoryTest PROPERTIES COMPILE_FLAGS -DKONSOLEPRIVATE_EXPORT=) target_link_libraries(HistoryTest ${KONSOLE_TEST_LIBS}) -kde4_add_unit_test(KeyboardTranslatorTest KeyboardTranslatorTest.cpp) +kde4_add_unit_test(KeyboardTranslatorTest KeyboardTranslatorTest.cpp ../KeyboardTranslator.cpp) +set_target_properties(KeyboardTranslatorTest PROPERTIES COMPILE_FLAGS -DKONSOLEPRIVATE_EXPORT=) target_link_libraries(KeyboardTranslatorTest ${KONSOLE_TEST_LIBS}) -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32) kde4_add_unit_test(PartTest PartTest.cpp) target_link_libraries(PartTest ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} @@ -38,8 +42,10 @@ kde4_add_unit_test(ProfileTest ProfileTest.cpp) target_link_libraries(ProfileTest ${KONSOLE_TEST_LIBS}) +if(NOT WIN32) kde4_add_unit_test(PtyTest PtyTest.cpp) target_link_libraries(PtyTest ${KDE4_KPTY_LIBS} ${KONSOLE_TEST_LIBS}) +endif() kde4_add_unit_test(SessionTest SessionTest.cpp) target_link_libraries(SessionTest ${KONSOLE_TEST_LIBS}) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
