Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2015-01-29 12:52:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2014-12-21 11:58:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2015-01-29 12:52:52.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 3 18:03:28 UTC 2015 - [email protected] + +- Update to 5.6.0 + * Enable fstab and upower backends on FreeBSD + * Power: Add aboutToSuspend signal + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php + +------------------------------------------------------------------- Old: ---- solid-5.5.0.tar.xz New: ---- solid-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.k2TztT/_old 2015-01-29 12:52:53.000000000 +0100 +++ /var/tmp/diff_new_pack.k2TztT/_new 2015-01-29 12:52:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package solid # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,11 @@ %define lname libKF5Solid5 Name: solid -Version: 5.5.0 +Version: 5.6.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.5.0 +BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes BuildRequires: flex BuildRequires: kf5-filesystem @@ -38,7 +38,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ solid-5.5.0.tar.xz -> solid-5.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/CMakeLists.txt new/solid-5.6.0/CMakeLists.txt --- old/solid-5.5.0/CMakeLists.txt 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/CMakeLists.txt 2015-01-03 13:17:31.000000000 +0100 @@ -3,7 +3,7 @@ project(Solid) -find_package(ECM 1.5.0 REQUIRED NO_MODULE) +find_package(ECM 1.6.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -38,7 +38,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.5.0") # handled by release scripts +set(KF5_VERSION "5.6.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX SOLID VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/solid_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/po/ca/solid5_qt.po new/solid-5.6.0/po/ca/solid5_qt.po --- old/solid-5.5.0/po/ca/solid5_qt.po 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/po/ca/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 @@ -4,7 +4,7 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <[email protected]>, 2009, 2010, 2011, 2012, 2013, 2014. -# Antoni Bella Pérez <[email protected]>, 2014. +# Antoni Bella Pérez <[email protected]>, 2014. msgid "" msgstr "" "Project-Id-Version: solid5_qt\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/po/da/solid5_qt.po new/solid-5.6.0/po/da/solid5_qt.po --- old/solid-5.5.0/po/da/solid5_qt.po 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/po/da/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-09-21 15:56+0200\n" +"PO-Revision-Date: 2014-12-29 20:08+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -1054,7 +1054,7 @@ #: tools/solid-hardware/solid-hardware.cpp:188 msgctxt "solid-hardware|" msgid "KDE tool for querying your hardware from the command line" -msgstr "" +msgstr "KDE-værktøj til at forespørge din hardware fra kommandolinjen" #: tools/solid-hardware/solid-hardware.cpp:191 msgctxt "solid-hardware|" @@ -1138,37 +1138,35 @@ #: tools/solid-hardware/solid-hardware.cpp:259 msgctxt "solid-hardware|" msgid "Show device details" -msgstr "" +msgstr "Vis enhedsdetaljer" #: tools/solid-hardware/solid-hardware.cpp:260 msgctxt "solid-hardware|" msgid "Show non portable information" -msgstr "" +msgstr "Vis ikke-portabel information" #: tools/solid-hardware/solid-hardware.cpp:273 -#, fuzzy -#| msgid "UPnP devices" msgctxt "solid-hardware|" msgid "Parent device udi" -msgstr "UPnP-enheder" +msgstr "Udi for overenhed" #: tools/solid-hardware/solid-hardware.cpp:301 #, qt-format msgctxt "solid-hardware|" msgid "Syntax Error: Unknown command '%1'" -msgstr "" +msgstr "Syntaksfejl: Ukendt kommando \"%1\"" #: tools/solid-hardware/solid-hardware.cpp:370 #, qt-format msgctxt "SolidHardware|" msgid "Error: %1 does not have the interface StorageAccess." -msgstr "" +msgstr "Fejl: %1 har ikke grænsefladen StorageAccess." #: tools/solid-hardware/solid-hardware.cpp:375 #, qt-format msgctxt "SolidHardware|" msgid "Error: %1 does not have the interface OpticalDrive." -msgstr "" +msgstr "Fejl: %1 har ikke grænsefladen OpticalDrive." #: tools/solid-hardware/solid-hardware.cpp:408 #, qt-format @@ -1179,7 +1177,7 @@ #: tools/solid-power/main.cpp:36 msgctxt "solid-power|" msgid "Tool to know and set the power management state of your device" -msgstr "" +msgstr "Værktøj til at se og angive strømstyringstilstand for din enhed" #: tools/solid-power/main.cpp:38 msgctxt "solid-power|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/po/ko/solid5_qt.po new/solid-5.6.0/po/ko/solid5_qt.po --- old/solid-5.5.0/po/ko/solid5_qt.po 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/po/ko/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-04-05 20:46+0900\n" +"PO-Revision-Date: 2014-10-16 21:01+0900\n" "Last-Translator: Park Shinjo <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -16,8 +16,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" +"X-Generator: Lokalize 1.5\n" #: solid/devices/backends/fstab/fstabmanager.cpp:88 msgctxt "Solid::Backends::Fstab::FstabManager|" @@ -1196,20 +1196,14 @@ #: tools/solid-power/main.cpp:36 msgctxt "solid-power|" msgid "Tool to know and set the power management state of your device" -msgstr "" +msgstr "장치의 전원 관리 상태를 보고 설정하는 도구" #: tools/solid-power/main.cpp:38 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Command to execute" msgctxt "solid-power|" msgid "Command to execute" msgstr "실행할 명령" #: tools/solid-power/main.cpp:40 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Show available commands" msgctxt "solid-power|" msgid "Show available commands" msgstr "사용 가능한 명령 보기" @@ -1221,3 +1215,5 @@ " # - acPlugged: whether the device is connected to the AC or " "not\n" msgstr "" +" # 시스템의 모든 전원 관리 정보를 표시합니다.\n" +" # - acPlugged: 장치가 AC 전원에 연결되어 있는지 여부\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/po/pa/solid5_qt.po new/solid-5.6.0/po/pa/solid5_qt.po --- old/solid-5.5.0/po/pa/solid5_qt.po 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/po/pa/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-07-08 15:02-0500\n" +"PO-Revision-Date: 2014-12-23 18:26-0600\n" "Last-Translator: A S Alam <[email protected]>\n" "Language-Team: Punjabi/Panjabi <[email protected]>\n" "Language: pa\n" @@ -1176,7 +1176,7 @@ #, qt-format msgctxt "SolidHardware|" msgid "Error: %1" -msgstr "" +msgstr "ਗਲਤੀ: %1" #: tools/solid-power/main.cpp:36 msgctxt "solid-power|" @@ -1192,9 +1192,6 @@ msgstr "ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ" #: tools/solid-power/main.cpp:40 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Show available commands" msgctxt "solid-power|" msgid "Show available commands" msgstr "ਉਪਲੱਬਧ ਕਮਾਂਡਾਂ ਵੇਖਾਓ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/po/zh_CN/solid5_qt.po new/solid-5.6.0/po/zh_CN/solid5_qt.po --- old/solid-5.5.0/po/zh_CN/solid5_qt.po 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/po/zh_CN/solid5_qt.po 2015-01-03 13:17:31.000000000 +0100 @@ -3,7 +3,7 @@ # # Ni Hui <[email protected]>, 2009, 2010, 2011. # Lie Ex <[email protected]>, 2010. -# Weng Xuetian <[email protected]>, 2012, 2013. +# Weng Xuetian <[email protected]>, 2012, 2013, 2014. # FengChao <[email protected]>, 2012. # Feng Chao <[email protected]>, 2014. msgid "" @@ -11,9 +11,9 @@ "Project-Id-Version: solid_qt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2014-06-21 21:40+0800\n" -"Last-Translator: Feng Chao <[email protected]>\n" -"Language-Team: Chinese Simplified <[email protected]>\n" +"PO-Revision-Date: 2014-12-18 17:13-0800\n" +"Last-Translator: Weng Xuetian <[email protected]>\n" +"Language-Team: Chinese Simplified <[email protected]>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1196,17 +1196,11 @@ msgstr "" #: tools/solid-power/main.cpp:38 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Command to execute" msgctxt "solid-power|" msgid "Command to execute" msgstr "要执行的命令" #: tools/solid-power/main.cpp:40 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Show available commands" msgctxt "solid-power|" msgid "Show available commands" msgstr "显示可用的命令" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/src/solid/devices/managerbase.cpp new/solid-5.6.0/src/solid/devices/managerbase.cpp --- old/solid-5.5.0/src/solid/devices/managerbase.cpp 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/src/solid/devices/managerbase.cpp 2015-01-03 13:17:31.000000000 +0100 @@ -63,6 +63,11 @@ # if defined(Q_OS_MAC) m_backends << new Solid::Backends::IOKit::IOKitManager(0); +# elif defined(Q_OS_FREEBSD) + m_backends << new Solid::Backends::UPower::UPowerManager(0) + << new Solid::Backends::Hal::HalManager(0) + << new Solid::Backends::Fstab::FstabManager(0); + # elif defined(Q_OS_WIN) && !defined(_WIN32_WCE) m_backends << new Solid::Backends::Win::WinDeviceManager(0); # elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/src/solid/power/backends/freedesktop/fdpowernotifier.cpp new/solid-5.6.0/src/solid/power/backends/freedesktop/fdpowernotifier.cpp --- old/solid-5.5.0/src/solid/power/backends/freedesktop/fdpowernotifier.cpp 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/src/solid/power/backends/freedesktop/fdpowernotifier.cpp 2015-01-03 13:17:31.000000000 +0100 @@ -62,7 +62,9 @@ void Solid::FDPowerNotifier::login1Resuming(bool active) { - if (!active) { + if (active) { + Q_EMIT aboutToSuspend(); + } else { Q_EMIT resumeFromSuspend(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/src/solid/power/backends/powernotifier.h new/solid-5.6.0/src/solid/power/backends/powernotifier.h --- old/solid-5.5.0/src/solid/power/backends/powernotifier.h 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/src/solid/power/backends/powernotifier.h 2015-01-03 13:17:31.000000000 +0100 @@ -33,6 +33,7 @@ Q_SIGNALS: void acPluggedChanged(bool plugged); + void aboutToSuspend(); void resumeFromSuspend(); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/src/solid/power/power.cpp new/solid-5.6.0/src/solid/power/power.cpp --- old/solid-5.5.0/src/solid/power/power.cpp 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/src/solid/power/power.cpp 2015-01-03 13:17:31.000000000 +0100 @@ -48,6 +48,7 @@ qRegisterMetaType<Solid::Inhibition::State>("Inhibition::State"); d->notifier = PowerBackendLoader::notifier(); connect(d->notifier, &PowerNotifier::acPluggedChanged, this, &Power::acPluggedChanged); + connect(d->notifier, &PowerNotifier::aboutToSuspend, this, &Power::aboutToSuspend); connect(d->notifier, &PowerNotifier::resumeFromSuspend, this, &Power::resumeFromSuspend); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/src/solid/power/power.h new/solid-5.6.0/src/solid/power/power.h --- old/solid-5.5.0/src/solid/power/power.h 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/src/solid/power/power.h 2015-01-03 13:17:31.000000000 +0100 @@ -116,6 +116,13 @@ void acPluggedChanged(bool plugged); /** + * Emitted when the system is about to suspend/hibernate + * + * @since 5.6 + */ + void aboutToSuspend(); + + /** * Emitted when the system has just resumed from being suspended/hibernated */ void resumeFromSuspend(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.5.0/src/tools/solid-power/solid-power.cpp new/solid-5.6.0/src/tools/solid-power/solid-power.cpp --- old/solid-5.5.0/src/tools/solid-power/solid-power.cpp 2014-12-06 13:48:28.000000000 +0100 +++ new/solid-5.6.0/src/tools/solid-power/solid-power.cpp 2015-01-03 13:17:31.000000000 +0100 @@ -55,4 +55,14 @@ QString status = plugged ? "yes" : "no"; lOut << "\tAC plugged changed:\t" << status << endl; }); -} \ No newline at end of file + + connect(power, &Power::aboutToSuspend, [](){ + QTextStream lOut(stdout); + lOut << "\tAbout to suspend" << endl; + }); + + connect(power, &Power::resumeFromSuspend, [](){ + QTextStream lOut(stdout); + lOut << "\tResume from suspend" << endl; + }); +} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
