December 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libksysguard5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package libksysguard5 for openSUSE:Factory checked in at 2015-12-29 12:57:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksysguard5 (Old) and /work/SRC/openSUSE:Factory/.libksysguard5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libksysguard5" Changes: -------- --- /work/SRC/openSUSE:Factory/libksysguard5/libksysguard5.changes 2015-11-24 22:27:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksysguard5.new/libksysguard5.changes 2015-12-29 12:57:13.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:57 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:11 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- libksysguard-5.4.3.tar.xz New: ---- libksysguard-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.7djaYq/_old 2015-12-29 12:57:14.000000000 +0100 +++ /var/tmp/diff_new_pack.7djaYq/_new 2015-12-29 12:57:14.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: libksysguard5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: Task management and system monitoring library License: GPL-2.0+ @@ -27,26 +27,26 @@ Source: libksysguard-%{version}.tar.xz Source1: baselibs.conf Source99: %{name}-rpmlintrc -BuildRequires: extra-cmake-modules >= 0.0.9 -BuildRequires: gcc-c++ -BuildRequires: kauth-devel -BuildRequires: kcompletion-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kservice-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kwindowsystem-devel -BuildRequires: plasma-framework-devel BuildRequires: xz -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.4.0 -BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 +BuildRequires: cmake(KF5Auth) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5Plasma) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Network) >= 5.4.0 +BuildRequires: cmake(Qt5Script) >= 5.4.0 +BuildRequires: cmake(Qt5WebKitWidgets) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xres) BuildRequires: pkgconfig(zlib) @@ -63,12 +63,12 @@ Summary: Task management and system monitoring library -- devel files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: kconfig-devel -Requires: ki18n-devel -Requires: kiconthemes-devel -Requires: pkgconfig(Qt5Core) >= 5.4.0 -Requires: pkgconfig(Qt5Network) >= 5.4.0 -Requires: pkgconfig(Qt5Widgets) >= 5.4.0 +Requires: cmake(KF5Config) +Requires: cmake(KF5I18n) +Requires: cmake(KF5IconThemes) +Requires: cmake(Qt5Core) >= 5.4.0 +Requires: cmake(Qt5Network) >= 5.4.0 +Requires: cmake(Qt5Widgets) >= 5.4.0 Conflicts: kdebase4-workspace-devel %description devel ++++++ libksysguard-5.4.3.tar.xz -> libksysguard-5.5.1.tar.xz ++++++ ++++ 14695 lines of diff (skipped)

1 0

commit libkscreen2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package libkscreen2 for openSUSE:Factory checked in at 2015-12-29 12:57:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkscreen2 (Old) and /work/SRC/openSUSE:Factory/.libkscreen2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkscreen2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkscreen2/libkscreen2.changes 2015-11-24 22:27:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkscreen2.new/libkscreen2.changes 2015-12-29 12:57:08.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:56 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:08 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- libkscreen-5.4.3.tar.xz New: ---- libkscreen-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkscreen2.spec ++++++ --- /var/tmp/diff_new_pack.A7BzyC/_old 2015-12-29 12:57:09.000000000 +0100 +++ /var/tmp/diff_new_pack.A7BzyC/_new 2015-12-29 12:57:09.000000000 +0100 @@ -19,23 +19,19 @@ %define lname libKF5Screen6 %define plasma_version 5.0.0 Name: libkscreen2 -Version: 5.4.3 +Version: 5.5.1 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.12 +BuildRequires: extra-cmake-modules >= 5.14.0 BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: libxcb-devel -BuildRequires: xcb-util-devel -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 -BuildRequires: pkgconfig(xcb-image) -BuildRequires: pkgconfig(xcb-keysyms) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xrandr) +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-randr) Summary: KDE's screen management library License: GPL-2.0+ Group: System/GUI/KDE @@ -59,7 +55,7 @@ Summary: KDE's screen management library (development package) Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} -Requires: pkgconfig(Qt5Core) >= 5.4.0 +Requires: cmake(Qt5Core) >= 5.4.0 %description devel Development files belonging to libkscreen, dynamic display management in KDE @@ -92,6 +88,7 @@ %doc COPYING* %{_kf5_plugindir}/ %{_kf5_libexecdir}/ +%{_kf5_sharedir}/dbus-1/services/org.kde.kscreen.service %files -n %{lname} %defattr(-,root,root) ++++++ libkscreen-5.4.3.tar.xz -> libkscreen-5.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/CMakeLists.txt new/libkscreen-5.5.1/CMakeLists.txt --- old/libkscreen-5.4.3/CMakeLists.txt 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/CMakeLists.txt 2015-12-15 11:26:53.000000000 +0100 @@ -1,9 +1,9 @@ -project(libkscreen) -set(PROJECT_VERSION "5.4.3") - cmake_minimum_required(VERSION 2.8.12) -find_package(ECM 1.3.0 REQUIRED NO_MODULE) +project(libkscreen) +set(PROJECT_VERSION "5.5.1") + +find_package(ECM 5.14.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) include(KDECompilerSettings) @@ -12,6 +12,7 @@ include(ECMPackageConfigHelpers) include(ECMMarkAsTest) include(ECMGenerateHeaders) +include(ECMQtDeclareLoggingCategory) include(FeatureSummary) include(CheckCXXCompilerFlag) @@ -40,8 +41,6 @@ endif (_HAVE_VISIBILITY_INLINES) endif (_HAVE_VISIBILITY AND NOT WIN32) -# include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - add_subdirectory(src) add_subdirectory(backends) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/autotests/CMakeLists.txt new/libkscreen-5.5.1/autotests/CMakeLists.txt --- old/libkscreen-5.4.3/autotests/CMakeLists.txt 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/autotests/CMakeLists.txt 2015-12-15 11:26:53.000000000 +0100 @@ -8,7 +8,9 @@ qt5_add_dbus_interface(test_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde.KScreen.FakeBackend.xml fakebackendinterface) add_executable(${_testname} ${test_SRCS}) target_link_libraries(${_testname} Qt5::Core Qt5::Gui Qt5::Test Qt5::DBus KF5::Screen) - add_test(kscreen-${_testname} ${_testname}) + add_test(NAME kscreen-${_testname} + COMMAND dbus-launch $<TARGET_FILE:${_testname}> + ) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro(KSCREEN_ADD_TEST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/autotests/testconfigmonitor.cpp new/libkscreen-5.5.1/autotests/testconfigmonitor.cpp --- old/libkscreen-5.4.3/autotests/testconfigmonitor.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/autotests/testconfigmonitor.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -64,9 +64,7 @@ void testChangeNotify() { //json file for the fake backend - QByteArray path(TEST_DATA); - path.append("/singleoutput.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "singleoutput.json"); // Prepare monitor KScreen::ConfigMonitor *monitor = KScreen::ConfigMonitor::instance(); @@ -78,7 +76,7 @@ QSignalSpy enabledSpy(config->output(1).data(), SIGNAL(isEnabledChanged())); - auto iface = new org::kde::kscreen::FakeBackend(QLatin1String("org.kde.KScreen.Backend.Fake"), + auto iface = new org::kde::kscreen::FakeBackend(QLatin1String("org.kde.KScreen"), QLatin1String("/fake"), QDBusConnection::sessionBus()); QVERIFY(iface->isValid()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/autotests/testscreenconfig.cpp new/libkscreen-5.5.1/autotests/testscreenconfig.cpp --- old/libkscreen-5.4.3/autotests/testscreenconfig.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/autotests/testscreenconfig.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -50,6 +50,7 @@ GetConfigOperation *op = new GetConfigOperation(); if (!op->exec()) { qWarning("GetConfigOperation error: %s", qPrintable(op->errorString())); + BackendManager::instance()->shutdownBackend(); return ConfigPtr(); } @@ -72,9 +73,7 @@ void testScreenConfig::singleOutput() { //json file for the fake backend - QByteArray path(TEST_DATA); - path.append("/singleoutput.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "singleoutput.json"); // QVERIFY2(kscreen, KScreen::errorString().toLatin1()); @@ -117,9 +116,7 @@ void testScreenConfig::singleOutputWithoutPreferred() { - QByteArray path(TEST_DATA); - path.append("/singleOutputWithoutPreferred.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "singleOutputWithoutPreferred.json"); const ConfigPtr config = getConfig(); QVERIFY(!config.isNull()); @@ -132,9 +129,7 @@ void testScreenConfig::multiOutput() { - QByteArray path(TEST_DATA); - path.append("/multipleoutput.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "multipleoutput.json"); const ConfigPtr config = getConfig(); QVERIFY(!config.isNull()); @@ -171,9 +166,7 @@ void testScreenConfig::clonesOutput() { - QByteArray path(TEST_DATA); - path.append("/multipleclone.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "multipleclone.json"); const ConfigPtr config = getConfig(); QVERIFY(!config.isNull()); @@ -195,14 +188,10 @@ void testScreenConfig::configCanBeApplied() { - QByteArray path(TEST_DATA); - path.append("/singleoutputBroken.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "singleoutputBroken.json"); const ConfigPtr brokenConfig = getConfig(); - path = TEST_DATA; - path.append("/singleoutput.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "singleoutput.json"); const ConfigPtr currentConfig = getConfig(); QVERIFY(!currentConfig.isNull()); const OutputPtr primaryBroken = brokenConfig->outputs()[2]; @@ -223,9 +212,7 @@ QVERIFY(Config::canBeApplied(brokenConfig)); - path = TEST_DATA; - path.append("/tooManyOutputs.json"); - setenv("TEST_DATA", path, 1); + qputenv("KSCREEN_BACKEND_ARGS", "TEST_DATA=" TEST_DATA "tooManyOutputs.json"); const ConfigPtr brokenConfig2 = getConfig(); QVERIFY(!brokenConfig2.isNull()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/backends/fake/fake.cpp new/libkscreen-5.5.1/backends/fake/fake.cpp --- old/libkscreen-5.4.3/backends/fake/fake.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/backends/fake/fake.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -48,6 +48,12 @@ QTimer::singleShot(0, this, SLOT(delayedInit())); } +void Fake::init(const QVariantMap &arguments) +{ + mConfigFile = arguments[QStringLiteral("TEST_DATA")].toString(); + qCDebug(KSCREEN_FAKE) << "Fake profile file:" << mConfigFile; +} + void Fake::delayedInit() { new FakeBackendAdaptor(this); @@ -65,17 +71,13 @@ QString Fake::serviceName() const { - if (!qgetenv("KSCREEN_TEST_INSTANCE").isEmpty()) { - return QString::fromLatin1("org.kde.KScreen.Backend.Fake.") + QString::fromLatin1(qgetenv("KSCREEN_TEST_INSTANCE")); - } - return QLatin1Literal("org.kde.KScreen.Backend.Fake"); } ConfigPtr Fake::config() const { if (mConfig.isNull()) { - mConfig = Parser::fromJson(QString(qgetenv("TEST_DATA"))); + mConfig = Parser::fromJson(mConfigFile); } return mConfig; @@ -94,7 +96,7 @@ QByteArray Fake::edid(int outputId) const { Q_UNUSED(outputId); - QFile file(QString(qgetenv("TEST_DATA"))); + QFile file(mConfigFile); file.open(QIODevice::ReadOnly); const QJsonDocument jsonDoc = QJsonDocument::fromJson(file.readAll()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/backends/fake/fake.h new/libkscreen-5.5.1/backends/fake/fake.h --- old/libkscreen-5.4.3/backends/fake/fake.h 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/backends/fake/fake.h 2015-12-15 11:26:53.000000000 +0100 @@ -33,6 +33,8 @@ explicit Fake(); virtual ~Fake(); + void init(const QVariantMap &arguments) Q_DECL_OVERRIDE; + QString name() const; QString serviceName() const; KScreen::ConfigPtr config() const; @@ -53,6 +55,7 @@ private: + QString mConfigFile; mutable KScreen::ConfigPtr mConfig; }; Q_DECLARE_LOGGING_CATEGORY(KSCREEN_FAKE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/backends/xrandr/xrandroutput.cpp new/libkscreen-5.5.1/backends/xrandr/xrandroutput.cpp --- old/libkscreen-5.4.3/backends/xrandr/xrandroutput.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/backends/xrandr/xrandroutput.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -213,12 +213,12 @@ void XRandROutput::updateModes(const XCB::OutputInfo &outputInfo) { /* Init modes */ - auto screenResources = XRandR::screenResources(); + XCB::ScopedPointer<xcb_randr_get_screen_resources_reply_t> screenResources(XRandR::screenResources()); Q_ASSERT(screenResources); if (!screenResources) { return; } - xcb_randr_mode_info_t *modes = xcb_randr_get_screen_resources_modes(screenResources); + xcb_randr_mode_info_t *modes = xcb_randr_get_screen_resources_modes(screenResources.data()); xcb_randr_mode_t *outputModes = xcb_randr_get_output_info_modes(outputInfo.data()); m_preferredModes.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/backends/xrandr/xrandrscreen.cpp new/libkscreen-5.5.1/backends/xrandr/xrandrscreen.cpp --- old/libkscreen-5.4.3/backends/xrandr/xrandrscreen.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/backends/xrandr/xrandrscreen.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -62,7 +62,9 @@ kscreenScreen->setMaxSize(m_maxSize); kscreenScreen->setMinSize(m_minSize); kscreenScreen->setCurrentSize(m_currentSize); - kscreenScreen->setMaxActiveOutputsCount(XRandR::screenResources()->num_crtcs); + + XCB::ScopedPointer<xcb_randr_get_screen_resources_reply_t> screenResources(XRandR::screenResources()); + kscreenScreen->setMaxActiveOutputsCount(screenResources->num_crtcs); return kscreenScreen; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/interfaces/org.kde.KScreen.Backend.xml new/libkscreen-5.5.1/interfaces/org.kde.KScreen.Backend.xml --- old/libkscreen-5.4.3/interfaces/org.kde.KScreen.Backend.xml 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/interfaces/org.kde.KScreen.Backend.xml 2015-12-15 11:26:53.000000000 +0100 @@ -21,6 +21,5 @@ <arg type="ay" direction="out" /> </method> - <method name="quit" /> </interface> </node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/interfaces/org.kde.KScreen.xml new/libkscreen-5.5.1/interfaces/org.kde.KScreen.xml --- old/libkscreen-5.4.3/interfaces/org.kde.KScreen.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/libkscreen-5.5.1/interfaces/org.kde.KScreen.xml 2015-12-15 11:26:53.000000000 +0100 @@ -0,0 +1,16 @@ +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> +<node> + <interface name="org.kde.KScreen"> + <method name="backend"> + <arg type="s" direction="out" /> + </method> + <method name="requestBackend"> + <arg type="s" direction="in" /> + <arg type="a{sv}" direction="in" /> + <arg type="b" direction="out" /> + <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/> + </method> + + <method name="quit" /> + </interface> +</node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/CMakeLists.txt new/libkscreen-5.5.1/src/CMakeLists.txt --- old/libkscreen-5.4.3/src/CMakeLists.txt 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/CMakeLists.txt 2015-12-15 11:26:53.000000000 +0100 @@ -1,7 +1,5 @@ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) -configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) - add_subdirectory(backendlauncher) set(libkscreen_SRCS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/abstractbackend.cpp new/libkscreen-5.5.1/src/abstractbackend.cpp --- old/libkscreen-5.4.3/src/abstractbackend.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/abstractbackend.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -19,6 +19,11 @@ #include "abstractbackend.h" +void KScreen::AbstractBackend::init(const QVariantMap &arguments) +{ + Q_UNUSED(arguments); +} + QByteArray KScreen::AbstractBackend::edid(int outputId) const { Q_UNUSED(outputId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/abstractbackend.h new/libkscreen-5.5.1/src/abstractbackend.h --- old/libkscreen-5.4.3/src/abstractbackend.h 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/abstractbackend.h 2015-12-15 11:26:53.000000000 +0100 @@ -41,6 +41,16 @@ virtual ~AbstractBackend() {} /** + * This is where the backend should perform all initialization. This method + * is always called right after the backend is created. + * + * Default implementation does nothing. + * + * @p arguments Optional arguments passed by caller. Used mostly for unit-testing. + */ + virtual void init(const QVariantMap &arguments); + + /** * Returns user-friendly name of the backend */ virtual QString name() const = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/CMakeLists.txt new/libkscreen-5.5.1/src/backendlauncher/CMakeLists.txt --- old/libkscreen-5.4.3/src/backendlauncher/CMakeLists.txt 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/CMakeLists.txt 2015-12-15 11:26:53.000000000 +0100 @@ -9,8 +9,16 @@ backenddbuswrapper.cpp ) +ecm_qt_declare_logging_category(backendlauncher_SRCS + HEADER debug_p.h + IDENTIFIER KSCREEN_BACKEND_LAUNCHER + CATEGORY_NAME kscreen.backendLauncher +) + qt5_add_dbus_adaptor(backendlauncher_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde.KScreen.Backend.xml backenddbuswrapper.h BackendDBusWrapper backendadaptor BackendAdaptor) +qt5_add_dbus_adaptor(backendlauncher_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde.KScreen.xml + backendloader.h BackendLoader backendloaderadaptor BackendLoaderAdaptor) add_executable(kscreen_backend_launcher ${backendlauncher_SRCS}) @@ -22,4 +30,13 @@ Qt5::DBus ) -install(TARGETS kscreen_backend_launcher DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}) +install(TARGETS kscreen_backend_launcher + DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5} +) + +configure_file(org.kde.kscreen.service.cmake + ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kscreen.service @ONLY +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kscreen.service + DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} +) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/backenddbuswrapper.cpp new/libkscreen-5.5.1/src/backendlauncher/backenddbuswrapper.cpp --- old/libkscreen-5.4.3/src/backendlauncher/backenddbuswrapper.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/backenddbuswrapper.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -20,6 +20,8 @@ #include "backenddbuswrapper.h" #include "backendloader.h" #include "backendadaptor.h" +#include "debug_p.h" + #include "src/configserializer_p.h" #include "src/config.h" #include "src/abstractbackend.h" @@ -48,14 +50,8 @@ bool BackendDBusWrapper::init() { QDBusConnection dbus = QDBusConnection::sessionBus(); - if (!dbus.registerService(mBackend->serviceName())) { - qCWarning(KSCREEN_BACKEND_LAUNCHER) << "Failed to register as DBus service: another launcher already running?"; - qCWarning(KSCREEN_BACKEND_LAUNCHER) << dbus.lastError().message(); - return false; - } - new BackendAdaptor(this); - if (!dbus.registerObject(QLatin1String("/"), this, QDBusConnection::ExportAdaptors)) { + if (!dbus.registerObject(QLatin1String("/backend"), this, QDBusConnection::ExportAdaptors)) { qCWarning(KSCREEN_BACKEND_LAUNCHER) << "Failed to export backend to DBus: another launcher already running?"; qCWarning(KSCREEN_BACKEND_LAUNCHER) << dbus.lastError().message(); return false; @@ -107,12 +103,6 @@ return edidData; } -void BackendDBusWrapper::quit() -{ - qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Launcher termination requested"; - qApp->exit(BackendLoader::LauncherStopped); -} - void BackendDBusWrapper::backendConfigChanged(const KScreen::ConfigPtr &config) { Q_ASSERT(!config.isNull()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/backenddbuswrapper.h new/libkscreen-5.5.1/src/backendlauncher/backenddbuswrapper.h --- old/libkscreen-5.4.3/src/backendlauncher/backenddbuswrapper.h 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/backenddbuswrapper.h 2015-12-15 11:26:53.000000000 +0100 @@ -45,7 +45,7 @@ QVariantMap setConfig(const QVariantMap &config); QByteArray getEdid(int output) const; - void quit(); + inline KScreen::AbstractBackend *backend() const { return mBackend; } Q_SIGNALS: void configChanged(const QVariantMap &config); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/backendloader.cpp new/libkscreen-5.5.1/src/backendlauncher/backendloader.cpp --- old/libkscreen-5.4.3/src/backendlauncher/backendloader.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/backendloader.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -18,6 +18,9 @@ */ #include "backendloader.h" +#include "backendloaderadaptor.h" +#include "backenddbuswrapper.h" +#include "debug_p.h" #include "src/abstractbackend.h" #include <QCoreApplication> @@ -31,8 +34,6 @@ #include <QDBusConnection> #include <QDBusInterface> -Q_LOGGING_CATEGORY(KSCREEN_BACKEND_LAUNCHER, "kscreen.backendLauncher") - void pluginDeleter(QPluginLoader *p) { if (p) { @@ -44,8 +45,9 @@ BackendLoader::BackendLoader() : QObject() - , mLoader(0) - , mBackend(0) + , QDBusContext() + , mLoader(Q_NULLPTR) + , mBackend(Q_NULLPTR) { } @@ -56,10 +58,64 @@ qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Backend loader destroyed"; } -bool BackendLoader::loadBackend(const QString& backend) +bool BackendLoader::init() +{ + QDBusConnection dbus = QDBusConnection::sessionBus(); + new BackendLoaderAdaptor(this); + if (!dbus.registerObject(QLatin1String("/"), this, QDBusConnection::ExportAdaptors)) { + qCWarning(KSCREEN_BACKEND_LAUNCHER) << "Failed to export backend to DBus: another launcher already running?"; + qCWarning(KSCREEN_BACKEND_LAUNCHER) << dbus.lastError().message(); + return false; + } + + return true; +} + +QString BackendLoader::backend() const { - qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Requested backend:" << backend; - const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); + if (mBackend) { + return mBackend->backend()->name(); + } + + return QString(); +} + +bool BackendLoader::requestBackend(const QString &backendName, const QVariantMap &arguments) +{ + if (mBackend) { + // If an backend is already loaded, but it's not the same as the one + // requested, then it's an error + if (!backendName.isEmpty() && mBackend->backend()->name() != backendName) { + sendErrorReply(QDBusError::Failed, QStringLiteral("Another backend is already active")); + return false; + } else { + // If caller requested the same one as already loaded, or did not + // request a specific backend, hapilly reuse the existing one + return true; + } + } + + KScreen::AbstractBackend *backend = loadBackend(backendName, arguments); + if (!backend) { + return false; + } + + mBackend = new BackendDBusWrapper(backend); + if (!mBackend->init()) { + delete mBackend; + mBackend = Q_NULLPTR; + pluginDeleter(mLoader); + mLoader = Q_NULLPTR; + return false; + } + return true; +} + +KScreen::AbstractBackend *BackendLoader::loadBackend(const QString &name, + const QVariantMap &arguments) +{ + qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Requested backend:" << name; + const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(name); const QStringList paths = QCoreApplication::libraryPaths(); qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Lookup paths: " << paths; Q_FOREACH (const QString &path, paths) { @@ -70,13 +126,13 @@ const QFileInfoList finfos = dir.entryInfoList(); Q_FOREACH (const QFileInfo &finfo, finfos) { // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND - if (backend.isEmpty() && (finfo.fileName().contains(QLatin1String("KSC_Fake")) || finfo.fileName().contains(QLatin1String("KSC_FakeUI")))) { + if (name.isEmpty() && (finfo.fileName().contains(QLatin1String("KSC_Fake")) || finfo.fileName().contains(QLatin1String("KSC_FakeUI")))) { continue; } // When on X11, skip the QScreen backend, instead use the XRandR backend, // if not specified in KSCREEN_BACKEND - if (backend.isEmpty() && + if (name.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_QScreen")) && QX11Info::isPlatformX11()) { continue; @@ -84,7 +140,7 @@ // When not on X11, skip the XRandR backend, and fall back to QSCreen // if not specified in KSCREEN_BACKEND - if (backend.isEmpty() && + if (name.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_XRandR")) && !QX11Info::isPlatformX11()) { continue; @@ -99,35 +155,30 @@ continue; } - mBackend = qobject_cast<KScreen::AbstractBackend*>(instance); - if (mBackend) { - if (!mBackend->isValid()) { - qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Skipping" << mBackend->name() << "backend"; - delete mBackend; - mBackend = 0; + auto backend = qobject_cast<KScreen::AbstractBackend*>(instance); + if (backend) { + backend->init(arguments); + if (!backend->isValid()) { + qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Skipping" << backend->name() << "backend"; + delete backend; continue; } // This is the only case we don't want to unload() and delete the loader, instead // we store it and unload it when the backendloader terminates. mLoader = loader.release(); - qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Loading" << mBackend->name() << "backend"; - return true; + qCDebug(KSCREEN_BACKEND_LAUNCHER) << "Loading" << backend->name() << "backend"; + return backend; } else { qCDebug(KSCREEN_BACKEND_LAUNCHER) << finfo.fileName() << "does not provide valid KScreen backend"; } } } - return false; -} - -KScreen::AbstractBackend* BackendLoader::backend() const -{ - return mBackend; + return Q_NULLPTR; } -bool BackendLoader::checkIsAlreadyRunning() +void BackendLoader::quit() { - return QDBusConnection::sessionBus().interface()->isServiceRegistered(mBackend->serviceName()); + qApp->quit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/backendloader.h new/libkscreen-5.5.1/src/backendlauncher/backendloader.h --- old/libkscreen-5.4.3/src/backendlauncher/backendloader.h 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/backendloader.h 2015-12-15 11:26:53.000000000 +0100 @@ -21,40 +21,38 @@ #define BACKENDLAUNCHER_H #include <QObject> -#include <QLoggingCategory> - -class QPluginLoader; +#include <QDBusContext> namespace KScreen { class AbstractBackend; } +class QPluginLoader; +class BackendDBusWrapper; + class BackendLoader : public QObject + , protected QDBusContext { Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "org.kde.KScreen") public: - enum State { - BackendLoaded = 0, - BackendAlreadyExists = 1, - BackendFailedToLoad = 2, - LauncherStopped = 3 - }; - explicit BackendLoader(); ~BackendLoader(); - bool loadBackend(const QString &backendName = QString()); - bool checkIsAlreadyRunning(); + bool init(); + + Q_INVOKABLE QString backend() const; + Q_INVOKABLE bool requestBackend(const QString &name, const QVariantMap &arguments); + Q_INVOKABLE void quit(); - KScreen::AbstractBackend* backend() const; +private: + KScreen::AbstractBackend *loadBackend(const QString &name, const QVariantMap &arguments); private: QPluginLoader *mLoader; - KScreen::AbstractBackend* mBackend; + BackendDBusWrapper *mBackend; }; -Q_DECLARE_LOGGING_CATEGORY(KSCREEN_BACKEND_LAUNCHER) - #endif // BACKENDLAUNCHER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/main.cpp new/libkscreen-5.5.1/src/backendlauncher/main.cpp --- old/libkscreen-5.4.3/src/backendlauncher/main.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/main.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -18,68 +18,30 @@ */ #include <QGuiApplication> -#include <QCommandLineParser> -#include <QDebug> +#include <QDBusConnection> +#include "debug_p.h" #include "backendloader.h" -#include "backenddbuswrapper.h" - -#include <src/abstractbackend.h> int main(int argc, char **argv) { QGuiApplication::setDesktopSettingsAware(false); QGuiApplication app(argc, argv); - BackendLoader *loader = new BackendLoader; - - QCommandLineOption backendOption(QLatin1String("backend"), - QLatin1String("Backend to load. When not specified, BackendLauncher will " - "try to load the best backend for current platform."), - QLatin1String("backend")); - QCommandLineParser parser; - parser.addOption(backendOption); - parser.addHelpOption(); - - parser.process(app); - - bool success = false; - if (parser.isSet(backendOption)) { - success = loader->loadBackend(parser.value(backendOption)); - } else { - success = loader->loadBackend(); + if (!QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.KScreen"))) { + qCWarning(KSCREEN_BACKEND_LAUNCHER) << "Cannot register org.kde.KScreen service. Another launcher already running?"; + return -1; } - // We failed to load any backend: abort immediatelly - if (!success) { - return BackendLoader::BackendFailedToLoad; - } - - // Create BackendDBusWrapper that takes implements the DBus interface and translates - // DBus calls to backend implementations. It will also take care of terminating this - // loader when no other KScreen-enabled processes are running - BackendDBusWrapper backendWrapper(loader->backend()); - if (!backendWrapper.init()) { - // Loading failed, maybe it failed because another process is already running; if so we still want to print the path before we exit - // Check if another Backend Launcher with this particular backend is already running - const bool alreadyRunning = loader->checkIsAlreadyRunning(); - if (alreadyRunning) { - // If it is, let caller now it's DBus service name and terminate - printf("%s", qPrintable(loader->backend()->serviceName())); - fflush(stdout); - return BackendLoader::BackendAlreadyExists; - } - return BackendLoader::BackendFailedToLoad; + BackendLoader *loader = new BackendLoader; + if (!loader->init()) { + return -2; } - // Now let caller now what's our DBus service name, so it can connect to us - printf("%s", qPrintable(loader->backend()->serviceName())); - fflush(stdout); - - // And go! const int ret = app.exec(); - // Make sure the backend is destroyed and unloaded before we return + // Make sure the backend is destroyed and unloaded before we return (i.e. + // as long as QApplication object and it's XCB connection still exist delete loader; return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendlauncher/org.kde.kscreen.service.cmake new/libkscreen-5.5.1/src/backendlauncher/org.kde.kscreen.service.cmake --- old/libkscreen-5.4.3/src/backendlauncher/org.kde.kscreen.service.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendlauncher/org.kde.kscreen.service.cmake 2015-12-15 11:26:53.000000000 +0100 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.kde.KScreen +Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/kscreen_backend_launcher \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendmanager.cpp new/libkscreen-5.5.1/src/backendmanager.cpp --- old/libkscreen-5.4.3/src/backendmanager.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendmanager.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -19,7 +19,6 @@ #include "backendmanager_p.h" #include "backendinterface.h" -#include "backendlauncher/backendloader.h" #include "debug_p.h" #include "getconfigoperation.h" #include "configserializer_p.h" @@ -30,15 +29,7 @@ #include <QDBusPendingReply> #include <QDBusConnectionInterface> #include <QStandardPaths> - -#include "config-libkscreen.h" - -#include <QProcess> - -#ifdef Q_OS_UNIX -#include <sys/wait.h> -#include <signal.h> -#endif +#include <QThread> using namespace KScreen; @@ -61,7 +52,6 @@ : QObject() , mInterface(0) , mCrashCount(0) - , mLauncher(0) , mShuttingDown(false) , mRequestsCounter(0) { @@ -97,7 +87,20 @@ } ++mRequestsCounter; - startBackend(QString::fromLatin1(qgetenv("KSCREEN_BACKEND"))); + const QByteArray args = qgetenv("KSCREEN_BACKEND_ARGS"); + QVariantMap arguments; + if (!args.isEmpty()) { + QList<QByteArray> arglist = args.split(';'); + Q_FOREACH (const QByteArray &arg, arglist) { + const int pos = arg.indexOf('='); + if (pos == -1) { + continue; + } + arguments.insert(arg.left(pos), arg.mid(pos + 1)); + } + } + + startBackend(QString::fromLatin1(qgetenv("KSCREEN_BACKEND")), arguments); } void BackendManager::emitBackendReady() @@ -109,139 +112,65 @@ } } -void BackendManager::startBackend(const QString &backend) -{ - if (mLauncher && mLauncher->state() == QProcess::Running) { - mLauncher->terminate(); - } - - mLauncher = new QProcess(this); - connect(mLauncher, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), - this, &BackendManager::launcherFinished); - connect(mLauncher, &QProcess::readyReadStandardOutput, - this, &BackendManager::launcherDataAvailable); - - QString launcher = QString::fromLatin1(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kscreen_backend_launcher"); - if (!QFile::exists(launcher)) { - launcher = QStandardPaths::findExecutable("kscreen_backend_launcher"); - if (launcher.isEmpty()) { - qCWarning(KSCREEN) << "Failed to locate kscreen_backend_launcher, KScreen will be useless"; - invalidateInterface(); - delete mLauncher; - mLauncher = 0; - QMetaObject::invokeMethod(this, "emitBackendReady", Qt::QueuedConnection); - return; - } - } - - mLauncher->setProgram(launcher); - if (!backend.isEmpty()) { - mLauncher->setArguments(QStringList() << "--backend" << backend); - } - - mLauncher->start(); - if (!qgetenv("KSCREEN_BACKEND_DEBUG").isEmpty()) { - pid_t pid = mLauncher->pid(); - qCDebug(KSCREEN) << "=================================="; - qCDebug(KSCREEN) << "KScreen BackendManager: Suspending backend launcher"; - qCDebug(KSCREEN) << "'gdb --pid" << pid << "' to debug"; - qCDebug(KSCREEN) << "'kill -SIGCONT" << pid << "' to continue"; - qCDebug(KSCREEN) << "=================================="; - qCDebug(KSCREEN); - kill(pid, SIGSTOP); - } - - mResetCrashCountTimer.start(); -} - -void BackendManager::launcherFinished(int exitCode, QProcess::ExitStatus exitStatus) +void BackendManager::startBackend(const QString &backend, const QVariantMap &arguments) { - qCDebug(KSCREEN) << "Launcher finished with exit code" << exitCode << ", status" << exitStatus; - - // Stop the timer if it's running, otherwise the number would get reset to 0 - // anyway even if we reached the sMaxCrashCount, and then the backend would - // be restarted again anyway. - mResetCrashCountTimer.stop(); - - if (exitStatus == QProcess::CrashExit) { - // Backend has crashed: restart it + // This will autostart the launcher if it's not running already, calling + // requestBackend(backend) will: + // a) if the launcher is started it will force it to load the correct backend, + // b) if the launcher is already running it will make sure it's running with + // the same backend as the one we requested and send an error otherwise + QDBusConnection conn = QDBusConnection::sessionBus(); + QDBusMessage call = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KScreen"), + QStringLiteral("/"), + QStringLiteral("org.kde.KScreen"), + QStringLiteral("requestBackend")); + call.setArguments({ backend, arguments }); + QDBusPendingCall pending = conn.asyncCall(call); + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pending); + connect(watcher, &QDBusPendingCallWatcher::finished, + this, &BackendManager::onBackendRequestDone); +} + +void BackendManager::onBackendRequestDone(QDBusPendingCallWatcher *watcher) +{ + watcher->deleteLater(); + QDBusPendingReply<bool> reply = *watcher; + // Most probably we requested an explicit backend that is different than the + // one already loaded in the launcher + if (reply.isError()) { + qCWarning(KSCREEN) << "Failed to request backend:" << reply.error().name() << ":" << reply.error().message(); invalidateInterface(); - if (!mShuttingDown) { - if (++mCrashCount <= sMaxCrashCount) { - requestBackend(); - } else { - qCWarning(KSCREEN) << "Launcher has crashed too many times: not restarting"; - mLauncher->deleteLater(); - mLauncher = 0; - } - } - mShuttingDown = false; + emitBackendReady(); return; } - switch (exitCode) { - case BackendLoader::BackendLoaded: - // This means that the launcher has terminated successfully after doing - // what it was asked to do, so delete the interface, but don't emit signals - invalidateInterface(); - break; - - case BackendLoader::BackendFailedToLoad: - // Launcher terminated immediatelly because there was no backend, this - // means that we didn't try before and someone is probably waiting for - // the signal - qCWarning(KSCREEN) << "Launcher failed to load any backend: KScreen will be useless"; + // Most probably request and explicit backend which is not available or failed + // to initialize, or the launcher did not find any suitable backend for the + // current platform. + if (!reply.value()) { + qCWarning(KSCREEN) << "Failed to request backend: unknown error"; invalidateInterface(); emitBackendReady(); - break; + return; + } - case BackendLoader::BackendAlreadyExists: - // The launcher wrote service name to stdout, so backendReady() was emitted - // from launcherDataAvailable(), nothing else to do here - qCDebug(KSCREEN) << "Service for requested backend already running"; - break; - - case BackendLoader::LauncherStopped: - // The launcher has been stopped on request, probably by someone calling - // shutdownBackend() - qCDebug(KSCREEN) << "Backend launcher terminated on requested"; + // The launcher has successfully loaded the backend we wanted and registered + // it to DBus (hopefuly), let's try to get an interface for the backend. + if (mInterface) { invalidateInterface(); - break; } - - mShuttingDown = false; - mLauncher->deleteLater(); - mLauncher = 0; -}; - -void BackendManager::launcherDataAvailable() -{ - mLauncher->setReadChannel(QProcess::StandardOutput); - const QByteArray service = mLauncher->readLine(); - qCDebug(KSCREEN) << "launcherDataAvailable:" << service; - mBackendService = QString::fromLatin1(service); - - mInterface = new org::kde::kscreen::Backend(mBackendService, - QLatin1String("/"), - QDBusConnection::sessionBus(), - this); + mInterface = new org::kde::kscreen::Backend(QStringLiteral("org.kde.KScreen"), + QStringLiteral("/backend"), + QDBusConnection::sessionBus()); if (!mInterface->isValid()) { - QDBusServiceWatcher *watcher = new QDBusServiceWatcher(mBackendService, - QDBusConnection::sessionBus()); - connect(watcher, &QDBusServiceWatcher::serviceOwnerChanged, - [&](const QString &service, const QString &oldOwner, const QString &newOwner) { - qDebug() << service << newOwner << oldOwner; - if (newOwner == mBackendService) { - backendServiceReady(); - } - }); + qCWarning(KSCREEN) << "Backend successfully requested, but we failed to obtain a valid DBus interface for it"; + invalidateInterface(); + emitBackendReady(); return; } - backendServiceReady(); -} -void BackendManager::backendServiceReady() -{ + // The backend is GO, so let's watch for it's possible disappearance, so we + // can invalidate the interface mServiceWatcher.addWatchedService(mBackendService); // Immediatelly request config @@ -249,6 +178,7 @@ [&](ConfigOperation *op) { mConfig = qobject_cast<GetConfigOperation*>(op)->config(); }); + // And listen for its change. connect(mInterface, &org::kde::kscreen::Backend::configChanged, [&](const QVariantMap &newConfig) { mConfig = KScreen::ConfigSerializer::deserializeConfig(newConfig); @@ -283,23 +213,24 @@ return; } + // If there are some currently pending requests, then wait for them to + // finish before quitting while (mRequestsCounter > 0) { mShutdownLoop.exec(); } mServiceWatcher.removeWatchedService(mBackendService); mShuttingDown = true; - const QDBusReply<uint> reply = QDBusConnection::sessionBus().interface()->servicePid(mInterface->service()); + QDBusMessage call = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KScreen"), + QStringLiteral("/"), + QStringLiteral("org.kde.KScreen"), + QStringLiteral("quit")); // Call synchronously - mInterface->quit().waitForFinished(); + QDBusConnection::sessionBus().call(call); invalidateInterface(); - if (mLauncher) { - mLauncher->waitForFinished(5000); - // This will ensure that launcherFinished() is called, which will take care - // of deleting the QProcess - } else { - // ... ? + while (QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.KScreen"))) { + QThread::msleep(100); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/backendmanager_p.h new/libkscreen-5.5.1/src/backendmanager_p.h --- old/libkscreen-5.4.3/src/backendmanager_p.h 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/backendmanager_p.h 2015-12-15 11:26:53.000000000 +0100 @@ -49,27 +49,23 @@ ~BackendManager(); void requestBackend(); + void shutdownBackend(); KScreen::ConfigPtr config() const; - void shutdownBackend(); - Q_SIGNALS: void backendReady(OrgKdeKscreenBackendInterface *backend); - private Q_SLOTS: void emitBackendReady(); - void startBackend(const QString &backend = QString()); - - void launcherFinished(int existCode, QProcess::ExitStatus exitStatus); - void launcherDataAvailable(); + void startBackend(const QString &backend = QString(), + const QVariantMap &arguments = QVariantMap()); + void onBackendRequestDone(QDBusPendingCallWatcher *watcher); void backendServiceUnregistered(const QString &serviceName); private: - void findBestBackend(); void invalidateInterface(); void backendServiceReady(); @@ -81,7 +77,6 @@ OrgKdeKscreenBackendInterface *mInterface; int mCrashCount; - QProcess *mLauncher; QString mBackendService; QDBusServiceWatcher mServiceWatcher; KScreen::ConfigPtr mConfig; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/config-libkscreen.h.cmake new/libkscreen-5.5.1/src/config-libkscreen.h.cmake --- old/libkscreen-5.4.3/src/config-libkscreen.h.cmake 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/config-libkscreen.h.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ - -#define CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/config.cpp new/libkscreen-5.5.1/src/config.cpp --- old/libkscreen-5.4.3/src/config.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/config.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -267,9 +267,9 @@ return; } - qDebug(KSCREEN) << "Primary output changed from" << primaryOutput() - << "(" << (primaryOutput().isNull() ? "none" : primaryOutput()->name()) << ") to" - << newPrimary << "(" << (newPrimary.isNull() ? "none" : newPrimary->name()) << ")"; + qCDebug(KSCREEN) << "Primary output changed from" << primaryOutput() + << "(" << (primaryOutput().isNull() ? "none" : primaryOutput()->name()) << ") to" + << newPrimary << "(" << (newPrimary.isNull() ? "none" : newPrimary->name()) << ")"; for (OutputPtr &output : d->outputs) { disconnect(output.data(), &KScreen::Output::isPrimaryChanged, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.4.3/src/getconfigoperation.cpp new/libkscreen-5.5.1/src/getconfigoperation.cpp --- old/libkscreen-5.4.3/src/getconfigoperation.cpp 2015-11-05 13:40:57.000000000 +0100 +++ new/libkscreen-5.5.1/src/getconfigoperation.cpp 2015-12-15 11:26:53.000000000 +0100 @@ -46,6 +46,8 @@ ConfigPtr config; int pendingEDIDs; + QPointer<org::kde::kscreen::Backend> mBackend; + private: Q_DECLARE_PUBLIC(GetConfigOperation) }; @@ -58,7 +60,7 @@ { } -void GetConfigOperationPrivate::backendReady(org::kde::kscreen::Backend* backend) +void GetConfigOperationPrivate::backendReady(org::kde::kscreen::Backend *backend) { ConfigOperationPrivate::backendReady(backend); @@ -70,10 +72,8 @@ return; } - QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(backend->getConfig(), this); - - const auto backendPointer = QPointer<org::kde::kscreen::Backend>(backend); - watcher->setProperty("backend", QVariant::fromValue(backendPointer)); + mBackend = backend; + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(mBackend->getConfig(), this); connect(watcher, &QDBusPendingCallWatcher::finished, this, &GetConfigOperationPrivate::onConfigReceived); } @@ -103,8 +103,7 @@ } pendingEDIDs = 0; - auto backend = watcher->property("backend").value<QPointer<org::kde::kscreen::Backend>>(); - if (!backend) { + if (!mBackend) { q->setError(tr("Backend invalidated")); q->emitResult(); return; @@ -114,7 +113,7 @@ continue; } - QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(backend->getEdid(output->id()), this); + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(mBackend->getEdid(output->id()), this); watcher->setProperty("outputId", output->id()); connect(watcher, &QDBusPendingCallWatcher::finished, this, &GetConfigOperationPrivate::onEDIDReceived);

1 0

commit libkdecoration2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package libkdecoration2 for openSUSE:Factory checked in at 2015-12-29 12:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdecoration2 (Old) and /work/SRC/openSUSE:Factory/.libkdecoration2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdecoration2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdecoration2/libkdecoration2.changes 2015-11-24 22:27:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdecoration2.new/libkdecoration2.changes 2015-12-29 12:57:02.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:56 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:05 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- kdecoration-5.4.3.tar.xz New: ---- kdecoration-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdecoration2.spec ++++++ --- /var/tmp/diff_new_pack.9hDXip/_old 2015-12-29 12:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.9hDXip/_new 2015-12-29 12:57:03.000000000 +0100 @@ -19,14 +19,14 @@ %define lname libkdecorations2-5 %define lname_private libkdecorations2private5 Name: libkdecoration2 -Version: 5.4.3 +Version: 5.5.1 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: kf5-filesystem -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 Summary: KDE's window decorations library License: GPL-2.0+ Group: System/GUI/KDE @@ -43,7 +43,7 @@ Group: Development/Libraries/C and C++ Requires: %{lname_private} = %{version} Requires: %{lname} = %{version} -Requires: pkgconfig(Qt5Gui) >= 5.4.0 +Requires: cmake(Qt5Gui) >= 5.4.0 Obsoletes: libkdecorations-devel %description devel ++++++ kdecoration-5.4.3.tar.xz -> kdecoration-5.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/CMakeLists.txt new/kdecoration-5.5.1/CMakeLists.txt --- old/kdecoration-5.4.3/CMakeLists.txt 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/CMakeLists.txt 2015-12-15 11:19:58.000000000 +0100 @@ -1,5 +1,5 @@ project(decoration-api) -set(PROJECT_VERSION "5.4.3") +set(PROJECT_VERSION "5.5.1") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/README.md new/kdecoration-5.5.1/README.md --- old/kdecoration-5.4.3/README.md 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/README.md 2015-12-15 11:19:58.000000000 +0100 @@ -12,6 +12,36 @@ * Decoration API for implementing a Decoration theme * Private API to implement the backend part (e.g. from Window Manager side) +## Providing a Decoration + +To provide a custom decoration one needs to create a plugin and provide an own implementation +of KDecoration2::Decoration. For a framework to load and find the plugin it needs to be compiled +with the proper json metadata. An example for such metadata (deco.json): + + { + "KPlugin": { + "Id": "org.kde.myAweseomeDecoration", + "ServiceTypes": [ + "org.kde.kdecoration2" + ] + }, + "org.kde.kdecoration2": { + "blur": false, /* blur behind not needed */ + "kcmodule": true /* comes with a configuration module */ + } + } + +To simplify one can use the KPluginFactory macro from the KCoreAddons framework: + + K_PLUGIN_FACTORY_WITH_JSON( + MyAwesomeDecorationFactory, + "deco.json", + registerPlugin<MyAwesomeDecoration::Decoration>(); + ) + +The plugin needs to get installed to `${PLUGIN_INSTALL_DIR}/org.kde.kdecoration2`. + + ## Links - Home page: <https://projects.kde.org/projects/kde/workspace/kdecoration> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/src/decoration.h new/kdecoration-5.5.1/src/decoration.h --- old/kdecoration-5.4.3/src/decoration.h 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/src/decoration.h 2015-12-15 11:19:58.000000000 +0100 @@ -33,6 +33,10 @@ class QPainter; class QWheelEvent; +/** + * @brief Framework for creating window decorations. + * + **/ namespace KDecoration2 { @@ -41,6 +45,32 @@ class DecorationButton; class DecorationSettings; +/** + * @brief Base class for the Decoration. + * + * To provide a Decoration one needs to inherit from this class. The framework will instantiate + * an instance of the inherited class for each DecoratedClient. + * + * The main tasks of the Decoration is to provide borders around the DecoratedClient. For this + * the Deocration provides border sizes: those should be adjusted depending on the state of the + * DecoratedClient. E.g. commonly a maximized DecoratedClient does not have borders on the side, + * only the title bar. + * + * Whenever the visual representation of the Decoration changes the slot @link Decoration::update @endlink + * should be invoked to request a repaint. The framework will in return invoke the + * @link Decoration::paint @endlink method. This method needs to be implemented by inheriting + * classes. + * + * A Decoration commonly provides buttons for interaction. E.g. a close button to close the + * DecoratedClient. For such actions the Decoration provides slots which should be connected to + * the clicked signals of the buttons. For convenience the framework provides the @link DecorationButton @endlink + * and the @link DecorationButtonGroup @endlink for easier layout. It is not required to use those, + * if one uses different ways to represent the actions one needs to filter the events accordingly. + * + * @see DecoratedClient + * @see DecorationButton + * @see DecorationButtonGroup + **/ class KDECORATIONS2_EXPORT Decoration : public QObject { Q_OBJECT @@ -123,6 +153,15 @@ **/ QSharedPointer<DecorationSettings> settings() const; + /** + * Implement this method in inheriting classes to provide the rendering. + * + * The @p painter is set up to paint on an internal QPaintDevice. The painting is + * implicitly double buffered. + * + * @param painter The painter which needs to be used for rendering + * @param repaintArea The region which needs to be repainted. + **/ virtual void paint(QPainter *painter, const QRect &repaintArea) = 0; virtual bool event(QEvent *event) override; @@ -159,6 +198,16 @@ void shadowChanged(const QSharedPointer<DecorationShadow> &shadow); protected: + /** + * Constructor for the Decoration. + * + * The @p args are used by the decoration framework to pass meta information + * to the Decoration. An inheriting class is supposed to pass the args to the + * parent class. + * + * @param parent The parent of the Decoration + * @param args Additional arguments passed in from the framework + **/ explicit Decoration(QObject *parent, const QVariantList &args); void setBorders(const QMargins &borders); void setResizeOnlyBorders(const QMargins &borders); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/src/decorationbutton.cpp new/kdecoration-5.5.1/src/decorationbutton.cpp --- old/kdecoration-5.4.3/src/decorationbutton.cpp 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/src/decorationbutton.cpp 2015-12-15 11:19:58.000000000 +0100 @@ -33,10 +33,12 @@ namespace KDecoration2 { +#ifndef DOXYGEN_SHOULD_SKIP_THIS uint qHash(const DecorationButtonType &type) { return static_cast<uint>(type); } +#endif DecorationButton::Private::Private(DecorationButtonType type, const QPointer<Decoration> &decoration, DecorationButton *parent) : decoration(decoration) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/src/decorationbutton.h new/kdecoration-5.5.1/src/decorationbutton.h --- old/kdecoration-5.4.3/src/decorationbutton.h 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/src/decorationbutton.h 2015-12-15 11:19:58.000000000 +0100 @@ -37,7 +37,9 @@ class DecorationButtonPrivate; class Decoration; +#ifndef DOXYGEN_SHOULD_SKIP_THIS uint KDECORATIONS2_EXPORT qHash(const DecorationButtonType &type); +#endif /** * @brief A button to be used in a Decoration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/src/decorationbuttongroup.cpp new/kdecoration-5.5.1/src/decorationbuttongroup.cpp --- old/kdecoration-5.4.3/src/decorationbuttongroup.cpp 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/src/decorationbuttongroup.cpp 2015-12-15 11:19:58.000000000 +0100 @@ -45,7 +45,9 @@ emit q->geometryChanged(geometry); } +namespace { static bool s_layoutRecursion = false; +} void DecorationButtonGroup::Private::updateLayout() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/src/decorationsettings.h new/kdecoration-5.5.1/src/decorationsettings.h --- old/kdecoration-5.4.3/src/decorationsettings.h 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/src/decorationsettings.h 2015-12-15 11:19:58.000000000 +0100 @@ -33,14 +33,47 @@ class DecorationBridge; class DecorationSettingsPrivate; +/** + * @brief Common settings for the Decoration. + * + * This class gets injected into the Decoration and provides recommendations for the + * Decoration. The Decoration is suggested to honor the settings, but may decide that some + * settings don't fit the design and ignore them. + * + * @see Decoration + **/ class KDECORATIONS2_EXPORT DecorationSettings : public QObject { Q_OBJECT + /** + * Whether the feature to put a DecoratedClient on all desktops is available. + * + * If this feature is not available a Decoration might decide to not show the + * DecorationButtonType::OnAllDesktops. + **/ Q_PROPERTY(bool onAllDesktopsAvailable READ isOnAllDesktopsAvailable NOTIFY onAllDesktopsAvailableChanged) + /** + * Whether the Decoration will be rendered with an alpha channel. + * + * If no alpha channel is available a Decoration should not use round borders. + **/ Q_PROPERTY(bool alphaChannelSupported READ isAlphaChannelSupported NOTIFY alphaChannelSupportedChanged) + /** + * Whether the Decoration should close the DecoratedClient when double clicking on the + * DecorationButtonType::Menu. + **/ Q_PROPERTY(bool closeOnDoubleClickOnMenu READ isCloseOnDoubleClickOnMenu NOTIFY closeOnDoubleClickOnMenuChanged) + /** + * The suggested ordering of the decoration buttons on the left. + **/ Q_PROPERTY(QVector<KDecoration2::DecorationButtonType> decorationButtonsLeft READ decorationButtonsLeft NOTIFY decorationButtonsLeftChanged) + /** + * The suggested ordering of the decoration buttons on the right. + **/ Q_PROPERTY(QVector<KDecoration2::DecorationButtonType> decorationButtonsRight READ decorationButtonsRight NOTIFY decorationButtonsRightChanged) + /** + * The suggested border size. + **/ Q_PROPERTY(KDecoration2::BorderSize borderSize READ borderSize NOTIFY borderSizeChanged) /** * The fundamental unit of space that should be used for sizes, expressed in pixels. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdecoration-5.4.3/src/decorationshadow.cpp new/kdecoration-5.5.1/src/decorationshadow.cpp --- old/kdecoration-5.4.3/src/decorationshadow.cpp 2015-11-05 13:32:14.000000000 +0100 +++ new/kdecoration-5.5.1/src/decorationshadow.cpp 2015-12-15 11:19:58.000000000 +0100 @@ -115,6 +115,8 @@ return QRect(0, d->innerShadowRect.top(), d->innerShadowRect.left(), d->innerShadowRect.height()); } +#ifndef DOXYGEN_SHOULD_SKIP_THIS + #define DELEGATE(type, name) \ type DecorationShadow::name() const \ { \ @@ -151,6 +153,7 @@ SETTER(const QImage&, setShadow, shadow) #undef SETTER +#endif void DecorationShadow::setPadding(const QMargins &margins) {

1 0

commit kwin5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package kwin5 for openSUSE:Factory checked in at 2015-12-29 12:56:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwin5 (Old) and /work/SRC/openSUSE:Factory/.kwin5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwin5" Changes: -------- --- /work/SRC/openSUSE:Factory/kwin5/kwin5.changes 2015-11-24 22:27:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwin5.new/kwin5.changes 2015-12-29 12:56:58.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:55 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:57 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- kwin-5.4.3.tar.xz New: ---- kwin-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwin5.spec ++++++ --- /var/tmp/diff_new_pack.k1BYdI/_old 2015-12-29 12:56:59.000000000 +0100 +++ /var/tmp/diff_new_pack.k1BYdI/_new 2015-12-29 12:56:59.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kwin5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: KDE Window Manager License: GPL-2.0+ @@ -27,63 +27,79 @@ Source: kwin-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRequires: extra-cmake-modules >= 0.0.11 -BuildRequires: kactivities5-devel >= 5.12.0 -BuildRequires: kcmutils-devel >= 5.12.0 -BuildRequires: kcompletion-devel >= 5.12.0 -BuildRequires: kconfig-devel >= 5.12.0 -BuildRequires: kconfigwidgets-devel >= 5.12.0 -BuildRequires: kcoreaddons-devel >= 5.12.0 -BuildRequires: kcrash-devel >= 5.12.0 -BuildRequires: kdeclarative-devel >= 5.12.0 -BuildRequires: kdoctools-devel >= 5.12.0 BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= 5.12.0 -BuildRequires: ki18n-devel >= 5.12.0 -BuildRequires: kiconthemes-devel >= 5.12.0 -BuildRequires: kinit-devel >= 5.12.0 -BuildRequires: kio-devel >= 5.12.0 -BuildRequires: knewstuff-devel >= 5.12.0 -BuildRequires: knotifications-devel >= 5.12.0 -BuildRequires: kpackage-devel >= 5.12.0 -BuildRequires: kservice-devel >= 5.12.0 -BuildRequires: kwayland-devel >= %{version} -BuildRequires: kwidgetsaddons-devel >= 5.12.0 -BuildRequires: kwindowsystem-devel >= 5.12.0 -BuildRequires: kxmlgui-devel >= 5.12.0 BuildRequires: libQt5Core-private-headers-devel >= 5.4.0 BuildRequires: libQt5Gui-private-headers-devel >= 5.4.0 +BuildRequires: libQt5PlatformSupport-private-headers-devel >= 5.4.0 +BuildRequires: cmake(KDecoration2) >= %{version} +BuildRequires: cmake(KF5Activities) >= 5.12.0 +BuildRequires: cmake(KF5Completion) >= 5.12.0 +BuildRequires: cmake(KF5Config) >= 5.12.0 +BuildRequires: cmake(KF5ConfigWidgets) >= 5.12.0 +BuildRequires: cmake(KF5CoreAddons) >= 5.12.0 +BuildRequires: cmake(KF5Crash) >= 5.12.0 +BuildRequires: cmake(KF5Declarative) >= 5.12.0 +BuildRequires: cmake(KF5DocTools) >= 5.12.0 +BuildRequires: cmake(KF5GlobalAccel) >= 5.12.0 +BuildRequires: cmake(KF5I18n) >= 5.12.0 +BuildRequires: cmake(KF5IconThemes) >= 5.12.0 +BuildRequires: cmake(KF5IdleTime) >= 5.12.0 +BuildRequires: cmake(KF5Init) >= 5.12.0 +BuildRequires: cmake(KF5KCMUtils) >= 5.12.0 +BuildRequires: cmake(KF5KIO) >= 5.12.0 +BuildRequires: cmake(KF5NewStuff) >= 5.12.0 +BuildRequires: cmake(KF5Notifications) >= 5.12.0 +BuildRequires: cmake(KF5Package) >= 5.12.0 +BuildRequires: cmake(KF5Plasma) >= 5.12.0 +BuildRequires: cmake(KF5Service) >= 5.12.0 +BuildRequires: cmake(KF5Wayland) >= %{version} +BuildRequires: cmake(KF5WidgetsAddons) >= 5.12.0 +BuildRequires: cmake(KF5WindowSystem) >= 5.12.0 +BuildRequires: cmake(KF5XmlGui) >= 5.12.0 +BuildRequires: cmake(KScreenLocker) >= %{version} +BuildRequires: cmake(Qt5Concurrent) >= 5.4.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Quick) >= 5.4.0 +BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0 +BuildRequires: cmake(Qt5Script) >= 5.4.0 +BuildRequires: cmake(Qt5UiTools) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} +BuildRequires: pkgconfig(wayland-egl) +%endif +BuildRequires: fdupes BuildRequires: libepoxy-devel -BuildRequires: libkdecoration2-devel >= %{version} -BuildRequires: libxcb-devel >= 1.10 -BuildRequires: plasma-framework-devel >= 5.12.0 BuildRequires: xz -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.4.0 -BuildRequires: pkgconfig(Qt5UiTools) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libinput) +%if 0%{?is_opensuse} +BuildRequires: pkgconfig(libinput) >= 0.10 BuildRequires: pkgconfig(libudev) +%endif BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(wayland-client) >= 1.2.0 BuildRequires: pkgconfig(wayland-cursor) >= 1.2.0 -%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} -BuildRequires: pkgconfig(wayland-egl) -%endif -BuildRequires: fdupes BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xcb) >= 1.10 +BuildRequires: pkgconfig(xcb-composite) >= 1.10 BuildRequires: pkgconfig(xcb-cursor) +BuildRequires: pkgconfig(xcb-damage) >= 1.10 +BuildRequires: pkgconfig(xcb-glx) >= 1.10 BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-keysyms) -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xcb-randr) >= 1.10 +BuildRequires: pkgconfig(xcb-render) >= 1.10 +BuildRequires: pkgconfig(xcb-shape) >= 1.10 +BuildRequires: pkgconfig(xcb-shm) >= 1.10 +BuildRequires: pkgconfig(xcb-sync) >= 1.10 +BuildRequires: pkgconfig(xcb-xfixes) >= 1.10 +BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 Provides: windowmanager # Needed for effects KCM at runtime Requires: libQt5Multimedia5 @@ -92,7 +108,6 @@ %requires_eq libQt5Core5 %requires_eq libQt5Gui5 %requires_ge Mesa-libEGL1 -%requires_ge libQt5Gui5 %requires_ge libKF5WindowSystem5 %requires_ge plasma-framework %if %{with lang} ++++++ kwin-5.4.3.tar.xz -> kwin-5.5.1.tar.xz ++++++ ++++ 192572 lines of diff (skipped)

1 0

commit kwayland for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package kwayland for openSUSE:Factory checked in at 2015-12-29 12:56:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland (Old) and /work/SRC/openSUSE:Factory/.kwayland.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwayland" Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes 2015-11-24 22:26:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwayland.new/kwayland.changes 2015-12-29 12:56:53.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Dec 15 17:49:54 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:51 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible +- Drop no longer applicable fix-wayland-1.3-dependency.diff + +------------------------------------------------------------------- Old: ---- fix-wayland-1.3-dependency.diff kwayland-5.4.3.tar.xz New: ---- kwayland-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.wpvzdu/_old 2015-12-29 12:56:54.000000000 +0100 +++ /var/tmp/diff_new_pack.wpvzdu/_new 2015-12-29 12:56:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: kwayland -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: KDE Wayland library License: LGPL-2.1+ @@ -25,23 +25,18 @@ Url: http://www.kde.org Source: %{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE fix-wayland-1.3-dependency.diff alarrosa(a)suse.de -- Changes the wayland version kwayland depends on -Patch0: fix-wayland-1.3-dependency.diff BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libQt5Gui-private-headers-devel >= 5.4.0 -%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse} -# We have a patched wayland 1.2.1 version in SLE12 with the required features from 1.3.0 -BuildRequires: wayland-devel >= 1.2.1 -%else -BuildRequires: wayland-devel >= 1.3.0 -%endif - -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 +# cmake(Qt5Concurrent) is not enabled as it is used for a not installed tool, and only built when BUILD_TESTING=ON +#BuildRequires: cmake(Qt5Concurrent) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(wayland-client) >= 1.7.0 +BuildRequires: pkgconfig(wayland-server) >= 1.7.0 Provides: libKF5WaylandClient5 = %{version} Obsoletes: libKF5WaylandClient5 <= %{version} Provides: libKF5WaylandServer5 = %{version} @@ -57,16 +52,13 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: extra-cmake-modules >= 1.2.0 -Requires: pkgconfig(Qt5Gui) >= 5.4.0 +Requires: cmake(Qt5Gui) >= 5.4.0 %description devel KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries. %prep %setup -q -%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse} -%patch0 -p1 -%endif %build %cmake_kf5 -d build ++++++ kwayland-5.4.3.tar.xz -> kwayland-5.5.1.tar.xz ++++++ ++++ 19320 lines of diff (skipped)

1 0

commit ksysguard5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package ksysguard5 for openSUSE:Factory checked in at 2015-12-29 12:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksysguard5 (Old) and /work/SRC/openSUSE:Factory/.ksysguard5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksysguard5" Changes: -------- --- /work/SRC/openSUSE:Factory/ksysguard5/ksysguard5.changes 2015-11-24 22:28:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksysguard5.new/ksysguard5.changes 2015-12-29 12:56:48.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:53 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:47 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- ksysguard-5.4.3.tar.xz New: ---- ksysguard-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.mXZ2a2/_old 2015-12-29 12:56:49.000000000 +0100 +++ /var/tmp/diff_new_pack.mXZ2a2/_new 2015-12-29 12:56:49.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: ksysguard5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: KDE System Guard daemon License: GPL-2.0 @@ -29,29 +29,22 @@ Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE 0001-Use-run-for-ksysguardd-s-pid-file.patch Patch0: 0001-Use-run-for-ksysguardd-s-pid-file.patch -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: kconfig-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdelibs4support-devel +BuildRequires: extra-cmake-modules >= 1.5.0 BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kinit-devel -BuildRequires: kitemviews-devel -BuildRequires: knewstuff-devel -BuildRequires: libksysguard5-devel BuildRequires: libsensors4-devel -BuildRequires: plasma-framework-devel BuildRequires: systemd-rpm-macros BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5SysGuard) >= %{version} +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5WebKitWidgets) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 Requires: libksysguard5-helper %if %{with lang} Recommends: %{name}-lang ++++++ ksysguard-5.4.3.tar.xz -> ksysguard-5.5.1.tar.xz ++++++ ++++ 3562 lines of diff (skipped)

1 0

commit ksshaskpass5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package ksshaskpass5 for openSUSE:Factory checked in at 2015-12-29 12:56:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksshaskpass5 (Old) and /work/SRC/openSUSE:Factory/.ksshaskpass5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksshaskpass5" Changes: -------- --- /work/SRC/openSUSE:Factory/ksshaskpass5/ksshaskpass5.changes 2015-11-24 22:26:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksshaskpass5.new/ksshaskpass5.changes 2015-12-29 12:56:39.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:53 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:43 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- ksshaskpass-5.4.3.tar.xz New: ---- ksshaskpass-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksshaskpass5.spec ++++++ --- /var/tmp/diff_new_pack.SBLA0R/_old 2015-12-29 12:56:41.000000000 +0100 +++ /var/tmp/diff_new_pack.SBLA0R/_new 2015-12-29 12:56:41.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: ksshaskpass5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: Plasma 5 version of ssh-askpass License: GPL-2.0+ @@ -28,14 +28,13 @@ Source99: %{name}-rpmlintrc Patch1: suse-tweaks.diff BuildRequires: extra-cmake-modules -BuildRequires: kcoreaddons-devel -BuildRequires: kdoctools-devel BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: kwallet-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: openssh-askpass -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(Qt5Core) >= 5.4.0 Requires: openssh-askpass %if %{with lang} Recommends: %{name}-lang ++++++ ksshaskpass-5.4.3.tar.xz -> ksshaskpass-5.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/CMakeLists.txt new/ksshaskpass-5.5.1/CMakeLists.txt --- old/ksshaskpass-5.4.3/CMakeLists.txt 2015-11-05 13:38:30.000000000 +0100 +++ new/ksshaskpass-5.5.1/CMakeLists.txt 2015-12-15 11:24:57.000000000 +0100 @@ -1,6 +1,6 @@ project(ksshaskpass) cmake_minimum_required(VERSION 2.8.12) -set(PROJECT_VERSION "5.4.3") +set(PROJECT_VERSION "5.5.1") find_package(Qt5 REQUIRED COMPONENTS Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ar/ksshaskpass.po new/ksshaskpass-5.5.1/po/ar/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ar/ksshaskpass.po 1970-01-01 01:00:00.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ar/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -0,0 +1,72 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Safa Alfulaij <safa1996alfulaij(a)gmail.com>, ٢٠١٥. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" +"PO-Revision-Date: ٢٠١٥-٠٨-١٧ ١١:٣٤+0300\n" +"Last-Translator: Safa Alfulaij <safa1996alfulaij(a)gmail.com>\n" +"Language-Team: Arabic <doc(a)arabeyes.org>\n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"X-Generator: Lokalize 2.0\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "صفا الفليج" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "safa1996alfulaij(a)gmail.com" + +#: main.cpp:41 main.cpp:106 +msgid "Ksshaskpass" +msgstr "" + +#: main.cpp:43 +msgid "KDE version of ssh-askpass" +msgstr "إصدارة كدي من ssh-askpass" + +#: main.cpp:45 +msgid "" +"(c) 2006 Hans van Leeuwen\n" +"(c) 2008-2010 Armin Berres" +msgstr "" + +#: main.cpp:46 +msgid "" +"Ksshaskpass allows you to interactively prompt users for a passphrase for " +"ssh-add" +msgstr "يسمح Ksshaskpass لك بطلب عبارة مرور ssh-add من المستخدمين بشكل تفاعليّ" + +#: main.cpp:51 +msgid "Armin Berres" +msgstr "" + +#: main.cpp:51 +msgid "Current author" +msgstr "المؤلّف الحاليّ" + +#: main.cpp:52 +msgid "Hans van Leeuwen" +msgstr "" + +#: main.cpp:52 +msgid "Original author" +msgstr "المؤلّف الأصليّ" + +#: main.cpp:59 +msgctxt "Name of a prompt for a password" +msgid "Prompt" +msgstr "اطلب عبارة المرور" + +#: main.cpp:66 +msgid "Please enter passphrase" +msgstr "فضلًا أدخل عبارة المرور" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ast/ksshaskpass.po new/ksshaskpass-5.5.1/po/ast/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ast/ksshaskpass.po 2015-11-05 13:38:23.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ast/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" -"PO-Revision-Date: 2015-04-06 19:40+0100\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" +"PO-Revision-Date: 2015-11-16 00:29+0100\n" "Last-Translator: enolp <enolp(a)softastur.org>\n" "Language-Team: Asturian <kde-i18n-doc(a)kde.org>\n" "Language: ast\n" @@ -17,57 +17,59 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#, fuzzy msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Softastur" -#, fuzzy msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "alministradores(a)softastur.org" #: main.cpp:41 main.cpp:106 msgid "Ksshaskpass" -msgstr "" +msgstr "Ksshaskpass" #: main.cpp:43 msgid "KDE version of ssh-askpass" -msgstr "" +msgstr "Versión KDE de ssh-askpass" #: main.cpp:45 msgid "" "(c) 2006 Hans van Leeuwen\n" "(c) 2008-2010 Armin Berres" msgstr "" +"(c) 2006 Hans van Leeuwen\n" +"(c) 2008-2010 Armin Berres" #: main.cpp:46 msgid "" "Ksshaskpass allows you to interactively prompt users for a passphrase for " "ssh-add" msgstr "" +"Ksshaskpass permítete suxeri-yos de mou interactivu a los usuarios por una " +"fras de pasu pa ssh-add" #: main.cpp:51 msgid "Armin Berres" -msgstr "" +msgstr "Armin Berres" #: main.cpp:51 msgid "Current author" -msgstr "" +msgstr "Autor actual" #: main.cpp:52 msgid "Hans van Leeuwen" -msgstr "" +msgstr "Hans van Leeuwen" #: main.cpp:52 msgid "Original author" -msgstr "" +msgstr "Original author" #: main.cpp:59 msgctxt "Name of a prompt for a password" msgid "Prompt" -msgstr "" +msgstr "Suxerir" #: main.cpp:66 msgid "Please enter passphrase" -msgstr "" \ No newline at end of file +msgstr "Introduz la fras de pasu, por favor" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/bs/ksshaskpass.po new/ksshaskpass-5.5.1/po/bs/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/bs/ksshaskpass.po 2015-11-05 13:38:24.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/bs/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kde5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-02-24 20:27+0100\n" "Last-Translator: Samir Ribić <megaribi(a)epn.ba>\n" "Language-Team: Bosnian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ca/ksshaskpass.po new/ksshaskpass-5.5.1/po/ca/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ca/ksshaskpass.po 2015-11-05 13:38:23.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ca/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-16 19:37+0100\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ca(a)valencia/ksshaskpass.po new/ksshaskpass-5.5.1/po/ca(a)valencia/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ca(a)valencia/ksshaskpass.po 2015-11-05 13:38:23.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ca(a)valencia/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-16 19:37+0100\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/cs/ksshaskpass.po new/ksshaskpass-5.5.1/po/cs/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/cs/ksshaskpass.po 2015-11-05 13:38:23.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/cs/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-04-13 14:19+0200\n" "Last-Translator: Vit Pelcak <vpelcak(a)suse.cz>\n" "Language-Team: Czech <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/da/ksshaskpass.po new/ksshaskpass-5.5.1/po/da/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/da/ksshaskpass.po 1970-01-01 01:00:00.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/da/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -0,0 +1,74 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Martin Schlander <mschlander(a)opensuse.org>, 2015. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" +"PO-Revision-Date: 2015-11-15 22:31+0100\n" +"Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n" +"Language-Team: Danish <kde-i18n-doc(a)kde.org>\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Martin Schlander" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "mschlander(a)opensuse.org" + +#: main.cpp:41 main.cpp:106 +msgid "Ksshaskpass" +msgstr "Ksshaskpass" + +#: main.cpp:43 +msgid "KDE version of ssh-askpass" +msgstr "KDE-version af ssh-askpass" + +#: main.cpp:45 +msgid "" +"(c) 2006 Hans van Leeuwen\n" +"(c) 2008-2010 Armin Berres" +msgstr "" +"(c) 2006 Hans van Leeuwen\n" +"(c) 2008-2010 Armin Berres" + +#: main.cpp:46 +msgid "" +"Ksshaskpass allows you to interactively prompt users for a passphrase for " +"ssh-add" +msgstr "" +"Ksshaskpass lader dig spørge brugere om adgangsfrase til ssh-add interaktivt" + +#: main.cpp:51 +msgid "Armin Berres" +msgstr "Armin Berres" + +#: main.cpp:51 +msgid "Current author" +msgstr "Nuværende forfatter" + +#: main.cpp:52 +msgid "Hans van Leeuwen" +msgstr "Hans van Leeuwen" + +#: main.cpp:52 +msgid "Original author" +msgstr "Oprindelig udvikler" + +#: main.cpp:59 +msgctxt "Name of a prompt for a password" +msgid "Prompt" +msgstr "Prompt" + +#: main.cpp:66 +msgid "Please enter passphrase" +msgstr "Angiv adgangsfrase" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/de/ksshaskpass.po new/ksshaskpass-5.5.1/po/de/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/de/ksshaskpass.po 2015-11-05 13:38:24.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/de/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -1,12 +1,9 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# # Burkhard Lück <lueck(a)hube-lueck.de>, 2015. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-15 20:39+0100\n" "Last-Translator: Burkhard Lück <lueck(a)hube-lueck.de>\n" "Language-Team: German <kde-i18n-de(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/el/ksshaskpass.po new/ksshaskpass-5.5.1/po/el/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/el/ksshaskpass.po 2015-11-05 13:38:24.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/el/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-02-10 14:46+0200\n" "Last-Translator: Dimitris Kardarakos <dimkard(a)gmail.com>\n" "Language-Team: Greek <kde-i18n-el(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/en_GB/ksshaskpass.po new/ksshaskpass-5.5.1/po/en_GB/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/en_GB/ksshaskpass.po 2015-11-05 13:38:24.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/en_GB/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-18 12:24+0000\n" "Last-Translator: \n" "Language-Team: British English <kde-l10n-en_gb(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/es/ksshaskpass.po new/ksshaskpass-5.5.1/po/es/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/es/ksshaskpass.po 2015-11-05 13:38:24.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/es/ksshaskpass.po 2015-12-15 11:24:54.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-16 18:39+0100\n" "Last-Translator: Eloy Cuadra <ecuadra(a)eloihr.net>\n" "Language-Team: Spanish <kde-l10n-es(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/fi/ksshaskpass.po new/ksshaskpass-5.5.1/po/fi/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/fi/ksshaskpass.po 2015-11-05 13:38:25.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/fi/ksshaskpass.po 2015-12-15 11:24:55.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-20 17:11+0200\n" "Last-Translator: Lasse Liehu <lasse.liehu(a)gmail.com>\n" "Language-Team: Finnish <lokalisointi(a)lists.coss.fi>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/fr/ksshaskpass.po new/ksshaskpass-5.5.1/po/fr/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/fr/ksshaskpass.po 2015-11-05 13:38:25.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/fr/ksshaskpass.po 2015-12-15 11:24:55.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-09-06 12:13+0100\n" "Last-Translator: Thomas Vergnaud <thomas.vergnaud(a)gmx.fr>\n" "Language-Team: French <kde-francophone(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/gl/ksshaskpass.po new/ksshaskpass-5.5.1/po/gl/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/gl/ksshaskpass.po 2015-11-05 13:38:25.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/gl/ksshaskpass.po 2015-12-15 11:24:55.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-03-15 10:57+0100\n" "Last-Translator: Adrián Chaves Fernández <adriyetichaves(a)gmail.com>\n" "Language-Team: Galician <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/it/ksshaskpass.po new/ksshaskpass-5.5.1/po/it/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/it/ksshaskpass.po 2015-11-05 13:38:26.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/it/ksshaskpass.po 2015-12-15 11:24:55.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-02-10 00:15+0100\n" "Last-Translator: Vincenzo Reale <smart2128(a)baslug.org>\n" "Language-Team: Italian <kde-i18n-it(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ja/ksshaskpass.po new/ksshaskpass-5.5.1/po/ja/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ja/ksshaskpass.po 2015-11-05 13:38:26.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ja/ksshaskpass.po 2015-12-15 11:24:55.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-15 22:34-0800\n" "Last-Translator: Japanese KDE translation team <kde-jp(a)kde.org>\n" "Language-Team: Japanese <kde-jp(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ko/ksshaskpass.po new/ksshaskpass-5.5.1/po/ko/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ko/ksshaskpass.po 2015-11-05 13:38:26.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ko/ksshaskpass.po 2015-12-15 11:24:55.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-04-25 23:39+0200\n" "Last-Translator: Shinjo Park <kde(a)peremen.name>\n" "Language-Team: Korean <kde(a)peremen.name>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/lt/ksshaskpass.po new/ksshaskpass-5.5.1/po/lt/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/lt/ksshaskpass.po 1970-01-01 01:00:00.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/lt/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -0,0 +1,78 @@ +# Lithuanian translations for trunk-kf package. +# Copyright (C) 2015 This_file_is_part_of_KDE +# This file is distributed under the same license as the trunk-kf package. +# +# Automatically generated, 2015. +# Liudas Ališauskas <liudas(a)akmc.lt>, 2015. +msgid "" +msgstr "" +"Project-Id-Version: trunk-kf 5\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" +"PO-Revision-Date: 2015-08-25 15:08+0200\n" +"Last-Translator: Liudas Ališauskas <liudas(a)akmc.lt>\n" +"Language-Team: Lithuanian <kde-i18n-lt(a)kde.org>\n" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" +"X-Generator: Lokalize 2.0\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Liudas Ališauskas" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "liudas(a)akmc.lt" + +#: main.cpp:41 main.cpp:106 +msgid "Ksshaskpass" +msgstr "Ksshaskpass" + +#: main.cpp:43 +msgid "KDE version of ssh-askpass" +msgstr "Programos ssh-askpass KDE versija" + +#: main.cpp:45 +msgid "" +"(c) 2006 Hans van Leeuwen\n" +"(c) 2008-2010 Armin Berres" +msgstr "" +"(c) 2006 Hans van Leeuwen\n" +"(c) 2008-2010 Armin Berres" + +#: main.cpp:46 +msgid "" +"Ksshaskpass allows you to interactively prompt users for a passphrase for " +"ssh-add" +msgstr "" +"Ksshaskpass leidžia interaktyviai klausti naudotojo slaptafrazės skirtos " +"programai ssh-add" + +#: main.cpp:51 +msgid "Armin Berres" +msgstr "Armin Berres" + +#: main.cpp:51 +msgid "Current author" +msgstr "Dabartinis autorius" + +#: main.cpp:52 +msgid "Hans van Leeuwen" +msgstr "Hans van Leeuwen" + +#: main.cpp:52 +msgid "Original author" +msgstr "Pradinis autorius" + +#: main.cpp:59 +msgctxt "Name of a prompt for a password" +msgid "Prompt" +msgstr "Paklausti" + +#: main.cpp:66 +msgid "Please enter passphrase" +msgstr "Prašome įvesti slaptafrazę" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/nb/ksshaskpass.po new/ksshaskpass-5.5.1/po/nb/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/nb/ksshaskpass.po 2015-11-05 13:38:27.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/nb/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -1,9 +1,11 @@ +# Translation of ksshaskpass to Norwegian Bokmål +# # Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>, 2015. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-06-13 22:14+0200\n" "Last-Translator: Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb(a)lister.ping.uio.no>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/nl/ksshaskpass.po new/ksshaskpass-5.5.1/po/nl/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/nl/ksshaskpass.po 2015-11-05 13:38:27.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/nl/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-12 11:26+0100\n" "Last-Translator: Freek de Kruijf <freekdekruijf(a)kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/nn/ksshaskpass.po new/ksshaskpass-5.5.1/po/nn/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/nn/ksshaskpass.po 2015-11-05 13:38:27.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/nn/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-09-29 11:17+0100\n" "Last-Translator: Karl Ove Hufthammer <karl(a)huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n-nn(a)lister.ping.uio.no>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/pa/ksshaskpass.po new/ksshaskpass-5.5.1/po/pa/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/pa/ksshaskpass.po 2015-11-05 13:38:27.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/pa/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-02-01 03:24-0600\n" "Last-Translator: A S Alam <aalam(a)users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users(a)list.sf.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/pl/ksshaskpass.po new/ksshaskpass-5.5.1/po/pl/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/pl/ksshaskpass.po 2015-11-05 13:38:28.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/pl/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" -"PO-Revision-Date: 2015-01-17 07:33+0100\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" +"PO-Revision-Date: 2015-12-05 07:15+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -63,7 +63,7 @@ #: main.cpp:52 msgid "Original author" -msgstr "Pierwotny autor" +msgstr "Autor pierwowzoru" #: main.cpp:59 msgctxt "Name of a prompt for a password" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/pt/ksshaskpass.po new/ksshaskpass-5.5.1/po/pt/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/pt/ksshaskpass.po 2015-11-05 13:38:28.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/pt/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-12 10:40+0000\n" "Last-Translator: José Nuno Coelho Pires <zepires(a)gmail.com>\n" "Language-Team: Portuguese <kde-i18n-pt(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/pt_BR/ksshaskpass.po new/ksshaskpass-5.5.1/po/pt_BR/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/pt_BR/ksshaskpass.po 2015-11-05 13:38:28.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/pt_BR/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-12 07:25-0200\n" "Last-Translator: André Marcelo Alvarenga <alvarenga(a)kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ro/ksshaskpass.po new/ksshaskpass-5.5.1/po/ro/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ro/ksshaskpass.po 2015-11-05 13:38:28.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ro/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-04-20 14:31+0300\n" "Last-Translator: Sergiu Bivol <sergiu(a)cip.md>\n" "Language-Team: Romanian <kde-i18n-ro(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/ru/ksshaskpass.po new/ksshaskpass-5.5.1/po/ru/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/ru/ksshaskpass.po 2015-11-05 13:38:28.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/ru/ksshaskpass.po 2015-12-15 11:24:56.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-04-13 21:32+0300\n" "Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" "Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sk/ksshaskpass.po new/ksshaskpass-5.5.1/po/sk/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sk/ksshaskpass.po 2015-11-05 13:38:28.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sk/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-13 18:39+0100\n" "Last-Translator: Roman Paholik <wizzardsk(a)gmail.com>\n" "Language-Team: Slovak <kde-sk(a)linux.sk>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sl/ksshaskpass.po new/ksshaskpass-5.5.1/po/sl/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sl/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sl/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-18 11:51+0100\n" "Last-Translator: Andrej Mernik <andrejm(a)ubuntu.si>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sr/ksshaskpass.po new/ksshaskpass-5.5.1/po/sr/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sr/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sr/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sr(a)ijekavian/ksshaskpass.po new/ksshaskpass-5.5.1/po/sr(a)ijekavian/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sr(a)ijekavian/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sr(a)ijekavian/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sr(a)ijekavianlatin/ksshaskpass.po new/ksshaskpass-5.5.1/po/sr(a)ijekavianlatin/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sr(a)ijekavianlatin/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sr(a)ijekavianlatin/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sr(a)latin/ksshaskpass.po new/ksshaskpass-5.5.1/po/sr(a)latin/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sr(a)latin/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sr(a)latin/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/sv/ksshaskpass.po new/ksshaskpass-5.5.1/po/sv/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/sv/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/sv/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-12 18:15+0100\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall(a)bredband.net>\n" "Language-Team: Swedish <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/uk/ksshaskpass.po new/ksshaskpass-5.5.1/po/uk/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/uk/ksshaskpass.po 2015-11-05 13:38:29.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/uk/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ksshaskpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-12 18:44+0200\n" "Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n" "Language-Team: Ukrainian <kde-i18n-uk(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/zh_CN/ksshaskpass.po new/ksshaskpass-5.5.1/po/zh_CN/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/zh_CN/ksshaskpass.po 2015-11-05 13:38:30.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/zh_CN/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-01-12 16:57-0800\n" "Last-Translator: Weng Xuetian <wengxt(a)gmail.com>\n" "Language-Team: Chinese Simplified <kde-china(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/po/zh_TW/ksshaskpass.po new/ksshaskpass-5.5.1/po/zh_TW/ksshaskpass.po --- old/ksshaskpass-5.4.3/po/zh_TW/ksshaskpass.po 2015-11-05 13:38:30.000000000 +0100 +++ new/ksshaskpass-5.5.1/po/zh_TW/ksshaskpass.po 2015-12-15 11:24:57.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:20+0000\n" +"POT-Creation-Date: 2015-01-12 08:05+0000\n" "PO-Revision-Date: 2015-02-15 19:48+0800\n" "Last-Translator: Franklin\n" "Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/src/main.cpp new/ksshaskpass-5.5.1/src/main.cpp --- old/ksshaskpass-5.4.3/src/main.cpp 2015-11-05 13:38:22.000000000 +0100 +++ new/ksshaskpass-5.5.1/src/main.cpp 2015-12-15 11:24:53.000000000 +0100 @@ -37,26 +37,26 @@ //TODO update it. KAboutData about( - "ksshaskpass", + QStringLiteral("ksshaskpass"), i18n("Ksshaskpass"), PROJECT_VERSION, i18n("KDE version of ssh-askpass"), KAboutLicense::GPL, i18n("(c) 2006 Hans van Leeuwen\n(c) 2008-2010 Armin Berres"), i18n("Ksshaskpass allows you to interactively prompt users for a passphrase for ssh-add"), - "http://www.kde-apps.org/content/show.php?action=content&content=50971", - "armin(a)space-based.de" + QStringLiteral("http://www.kde-apps.org/content/show.php?action=content&content=50971"), + QStringLiteral("armin(a)space-based.de") ); - about.addAuthor(i18n("Armin Berres"), i18n("Current author"), "armin(a)space-based.de", 0); - about.addAuthor(i18n("Hans van Leeuwen"), i18n("Original author"), "hanz(a)hanz.nl", 0); + about.addAuthor(i18n("Armin Berres"), i18n("Current author"), QStringLiteral("armin(a)space-based.de"), 0); + about.addAuthor(i18n("Hans van Leeuwen"), i18n("Original author"), QStringLiteral("hanz(a)hanz.nl"), 0); QCommandLineParser parser; QApplication app(argc, argv); KAboutData::setApplicationData(about); parser.addVersionOption(); parser.addHelpOption(); - parser.addOption(QCommandLineOption(QStringList() << QLatin1String("+[prompt]"), i18nc("Name of a prompt for a password", "Prompt"))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("+[prompt]"), i18nc("Name of a prompt for a password", "Prompt"))); about.setupCommandLine(&parser); parser.process(app); @@ -69,7 +69,7 @@ bool wrongPassphrase = false; // Parse commandline arguments - if (parser.positionalArguments().count() > 0) { + if (!parser.positionalArguments().isEmpty()) { dialog = parser.positionalArguments().at(0); keyFile = dialog.section(' ', -2).remove(':'); @@ -96,7 +96,7 @@ // Password could not be retrieved from wallet. Open password dialog if (password.isEmpty()) { // create the password dialog, but only show "Enable Keep" button, if the wallet is open - KPasswordDialog::KPasswordDialogFlag flag; + KPasswordDialog::KPasswordDialogFlag flag(KPasswordDialog::NoFlags); if (wallet.get()) { flag = KPasswordDialog::ShowKeepPassword; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksshaskpass-5.4.3/src/org.kde.ksshaskpass.desktop new/ksshaskpass-5.5.1/src/org.kde.ksshaskpass.desktop --- old/ksshaskpass-5.4.3/src/org.kde.ksshaskpass.desktop 2015-11-05 13:38:22.000000000 +0100 +++ new/ksshaskpass-5.5.1/src/org.kde.ksshaskpass.desktop 2015-12-15 11:24:53.000000000 +0100 @@ -6,6 +6,7 @@ Name[ca]=SSH AskPass Name[ca@valencia]=SSH AskPass Name[cs]=SSH AskPass +Name[da]=SSH AskPass Name[de]=SSH AskPass Name[el]=SSH AskPass Name[en_GB]=SSH AskPass @@ -16,6 +17,7 @@ Name[hu]=SSH AskPass Name[it]=SSH AskPass Name[ko]=SSH AskPass +Name[lt]=SSH AskPass Name[nb]=SSH AskPass Name[nl]=SSH AskPass Name[nn]=SSH AskPass @@ -43,6 +45,7 @@ GenericName[ca]=ssh-add GenericName[ca@valencia]=ssh-add GenericName[cs]=ssh-add +GenericName[da]=ssh-add GenericName[de]=ssh-add GenericName[el]=ssh-add GenericName[en_GB]=ssh-add @@ -53,6 +56,7 @@ GenericName[hu]=ssh-add GenericName[it]=ssh-add GenericName[ko]=ssh-add +GenericName[lt]=ssh-add GenericName[nb]=ssh-add GenericName[nl]=ssh-add GenericName[nn]=ssh-add @@ -76,10 +80,12 @@ GenericName[zh_TW]=ssh-add Comment=Enter passphrase to authenticate to the ssh agent Comment[ar]=أدخل عبارة المرور للاستيثاق مع وكيل SSH +Comment[ast]=Introduz la fras de pasu p'autenticate col axente ssh Comment[bs]=Unesi lozinku za prijavu na ssh agenta Comment[ca]=Introduïu la frase de contrasenya per autenticar-se amb l'agent ssh Comment[ca@valencia]=Introduïu la frase de contrasenya per autenticar-se amb l'agent ssh Comment[cs]=Zadejte heslo pro ověření agenta ssh +Comment[da]=Angiv adgangsfrase til at autentificere til ssh-agenten Comment[de]=Geben Sie einen Kennsatz zur Authentifizierung am SSH-Agent eingeben Comment[el]=Καταχωρήστε συνθηματικό για την ταυτοποίηση με τον πράκτορα ssh Comment[en_GB]=Enter passphrase to authenticate to the ssh agent @@ -90,6 +96,7 @@ Comment[hu]=Adja meg a jelszót az ssh agent hitelesítéséhez Comment[it]=Digita la frase segreta per l'autenticazione all'agente ssh Comment[ko]=SSH 에이전트에 인증할 암호를 입력하십시오 +Comment[lt]=Įveskite slaptą frazę skirtą, kad nustatyti tapatybę ssh agente Comment[nb]=Oppgi passfrase for autentisering til ssh-agenten Comment[nl]=Voer wachtzin in voor authenticatie bij de ssh-agent Comment[nn]=Skriv inn passfrase for autentisering til ssh-agenten

1 0

commit kscreen5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package kscreen5 for openSUSE:Factory checked in at 2015-12-29 12:56:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kscreen5 (Old) and /work/SRC/openSUSE:Factory/.kscreen5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kscreen5" Changes: -------- --- /work/SRC/openSUSE:Factory/kscreen5/kscreen5.changes 2015-11-24 22:26:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kscreen5.new/kscreen5.changes 2015-12-29 12:56:32.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:52 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:39 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- kscreen-5.4.3.tar.xz New: ---- kscreen-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kscreen5.spec ++++++ --- /var/tmp/diff_new_pack.sj9yZI/_old 2015-12-29 12:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.sj9yZI/_new 2015-12-29 12:56:36.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreen5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: KDE's screen management software License: GPL-2.0+ @@ -29,26 +29,17 @@ BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kdbusaddons-devel BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel -BuildRequires: ki18n-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kxmlgui-devel -BuildRequires: libkscreen2-devel >= %{version} -BuildRequires: libxcb-devel -BuildRequires: xcb-util-devel -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 -BuildRequires: pkgconfig(Qt5QuickWidgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 -BuildRequires: pkgconfig(xcb-image) -BuildRequires: pkgconfig(xcb-keysyms) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xrandr) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5GlobalAccel) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Screen) >= %{version} +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 Requires: kded Requires: libkscreen2-plugin >= %{version} %if %{with lang} ++++++ kscreen-5.4.3.tar.xz -> kscreen-5.5.1.tar.xz ++++++ ++++ 3421 lines of diff (skipped)

1 0

commit kmenuedit5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package kmenuedit5 for openSUSE:Factory checked in at 2015-12-29 12:56:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmenuedit5 (Old) and /work/SRC/openSUSE:Factory/.kmenuedit5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmenuedit5" Changes: -------- --- /work/SRC/openSUSE:Factory/kmenuedit5/kmenuedit5.changes 2015-11-24 22:26:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmenuedit5.new/kmenuedit5.changes 2015-12-29 12:56:27.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 15 17:49:51 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:35 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- kmenuedit-5.4.3.tar.xz New: ---- kmenuedit-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmenuedit5.spec ++++++ --- /var/tmp/diff_new_pack.Uw1p0v/_old 2015-12-29 12:56:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Uw1p0v/_new 2015-12-29 12:56:28.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kmenuedit5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: Provides the interface and basic tools for the KDE workspace License: GPL-2.0 @@ -26,23 +26,21 @@ Url: http://www.kde.org/ Source: kmenuedit-%{version}.tar.xz Source99: %{name}-rpmlintrc -BuildRequires: extra-cmake-modules +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: kdbusaddons-devel -BuildRequires: kdelibs4support-devel BuildRequires: kf5-filesystem -BuildRequires: khotkeys5 -BuildRequires: khotkeys5-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kxmlgui-devel -BuildRequires: sonnet-devel BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Xml) >= 5.4.0 +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Sonnet) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(KHotKeysDBusInterface) >= %{version} +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Xml) >= 5.4.0 %if %{with lang} Recommends: %{name}-lang %endif ++++++ kmenuedit-5.4.3.tar.xz -> kmenuedit-5.5.1.tar.xz ++++++ ++++ 1980 lines of diff (skipped)

1 0

commit kinfocenter5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '15

29 Dec '15

Hello community, here is the log from the commit of package kinfocenter5 for openSUSE:Factory checked in at 2015-12-29 12:56:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kinfocenter5 (Old) and /work/SRC/openSUSE:Factory/.kinfocenter5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kinfocenter5" Changes: -------- --- /work/SRC/openSUSE:Factory/kinfocenter5/kinfocenter5.changes 2015-11-24 22:26:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kinfocenter5.new/kinfocenter5.changes 2015-12-29 12:56:22.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Dec 15 17:49:51 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:32 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible +- Drop upstreamed kinfocenter-fix-cmdline-parsing.patch + +------------------------------------------------------------------- Old: ---- kinfocenter-5.4.3.tar.xz kinfocenter-fix-cmdline-parsing.patch New: ---- kinfocenter-5.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinfocenter5.spec ++++++ --- /var/tmp/diff_new_pack.fSOQkd/_old 2015-12-29 12:56:23.000000000 +0100 +++ /var/tmp/diff_new_pack.fSOQkd/_new 2015-12-29 12:56:23.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kinfocenter5 -Version: 5.4.3 +Version: 5.5.1 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ @@ -28,28 +28,34 @@ Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE plasma-session-name.patch Patch0: plasma-session-name.patch -# PATCH-FIX-UPSTREAM kinfocenter-fix-cmdline-parsing.patch -- Fixes crash when run with --version -Patch1: kinfocenter-fix-cmdline-parsing.patch -BuildRequires: extra-cmake-modules -BuildRequires: kcmutils-devel -BuildRequires: kcompletion-devel -BuildRequires: kconfig-devel -BuildRequires: kdeclarative-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kdoctools-devel +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: kio-devel -BuildRequires: kpackage-devel -BuildRequires: kxmlgui-devel BuildRequires: libraw1394-devel BuildRequires: pciutils-devel -BuildRequires: plasma-framework-devel -BuildRequires: solid-devel BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(KF5Completion) >= 5.9.0 +BuildRequires: cmake(KF5Config) >= 5.9.0 +BuildRequires: cmake(KF5ConfigWidgets) >= 5.9.0 +BuildRequires: cmake(KF5CoreAddons) >= 5.9.0 +BuildRequires: cmake(KF5DBusAddons) >= 5.9.0 +BuildRequires: cmake(KF5Declarative) >= 5.9.0 +BuildRequires: cmake(KF5DocTools) >= 5.9.0 +BuildRequires: cmake(KF5I18n) >= 5.9.0 +BuildRequires: cmake(KF5IconThemes) >= 5.9.0 +BuildRequires: cmake(KF5KCMUtils) >= 5.9.0 +BuildRequires: cmake(KF5KDELibs4Support) >= 5.9.0 +BuildRequires: cmake(KF5KIO) >= 5.9.0 +BuildRequires: cmake(KF5Package) >= 5.9.0 +BuildRequires: cmake(KF5Service) >= 5.9.0 +BuildRequires: cmake(KF5Solid) >= 5.9.0 +BuildRequires: cmake(KF5Solid) >= 5.9.0 +BuildRequires: cmake(KF5Wayland) >= %{version} +BuildRequires: cmake(KF5WidgetsAddons) >= 5.9.0 +BuildRequires: cmake(KF5XmlGui) >= 5.9.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: pkgconfig(egl) %ifarch %arm aarch64 BuildRequires: pkgconfig(glesv2) @@ -57,9 +63,7 @@ BuildRequires: pkgconfig(gl) %endif BuildRequires: pkgconfig(glu) -%if 0%{?suse_version} > 1310 -BuildRequires: kwayland-devel >= 5.0.95 -%endif +BuildRequires: pkgconfig(x11) Conflicts: kdebase4-workspace < 5.3.0 %if %{with lang} Recommends: %{name}-lang @@ -73,7 +77,6 @@ %prep %setup -q -n kinfocenter-%{version} %patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -82,10 +85,6 @@ %install %kf5_makeinstall -C build -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) %doc COPYING* ++++++ kinfocenter-5.4.3.tar.xz -> kinfocenter-5.5.1.tar.xz ++++++ ++++ 45211 lines of diff (skipped) ++++++ plasma-session-name.patch ++++++ --- /var/tmp/diff_new_pack.fSOQkd/_old 2015-12-29 12:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.fSOQkd/_new 2015-12-29 12:56:24.000000000 +0100 @@ -6,8 +6,8 @@ QString Module::plasmaVersion() const { const QStringList &filePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, -- "xsessions/plasma.desktop"); -+ "xsessions/plasma5.desktop"); +- QStringLiteral("xsessions/plasma.desktop")); ++ QStringLiteral("xsessions/plasma5.desktop")); if (filePaths.length() < 1) { return QString();

1 0