Hello community, here is the log from the commit of package powerdevil5 for openSUSE:Factory checked in at 2015-05-11 19:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerdevil5 (Old) and /work/SRC/openSUSE:Factory/.powerdevil5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerdevil5" Changes: -------- --- /work/SRC/openSUSE:Factory/powerdevil5/powerdevil5.changes 2015-03-25 09:59:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.powerdevil5.new/powerdevil5.changes 2015-05-11 19:31:54.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 23 13:27:35 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.3 Final: + * For more details please see: + https://www.kde.org/announcements/plasma-5.3.0.php +- Only conflict with kdebase4-workspace < 5.3.0 + +------------------------------------------------------------------- +Sat Apr 11 18:53:51 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.2.95 aka 5.3 beta: + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.2.95.php +- Update required Qt version to 5.4.0 +- Added libkscreen2-devel BuildRequires +- Drop pkgconfig(x11) and pkgconfig(xrandr) BuildRequires +- Drop activityConfig.patch, merged upstream +- Added old_action_names.patch, until we have newer polkit-default-privs + +------------------------------------------------------------------- Old: ---- activityConfig.patch powerdevil-5.2.2.tar.xz New: ---- old_action_names.patch powerdevil-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerdevil5.spec ++++++ --- /var/tmp/diff_new_pack.YaTyyV/_old 2015-05-11 19:31:54.000000000 +0200 +++ /var/tmp/diff_new_pack.YaTyyV/_new 2015-05-11 19:31:54.000000000 +0200 @@ -16,8 +16,9 @@ # +%bcond_without lang Name: powerdevil5 -Version: 5.2.2 +Version: 5.3.0 Release: 0 Summary: KDE Power Management module License: GPL-2.0+ @@ -25,9 +26,11 @@ Url: http://www.kde.org Source: powerdevil-%{version}.tar.xz Source99: %{name}-rpmlintrc -# PATCHES 100-1000 and above are from upstream 5.2 branch -# PATCHES 1000 and above are from upstream master/5.3 branch -Patch1000: activityConfig.patch +# PATCH-FIX-OPENSUSE old_action_names.patch -- until we have newer polkit-default-privs. the actions are the same as in 5.2.x, they are only renamed +Patch0: old_action_names.patch +# PATCHES 100-200 and above are from upstream 5.3 branch +# PATCHES 201-300 and above are from upstream master/5.4 branch +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kactivities5-devel BuildRequires: kauth-devel BuildRequires: kconfig-devel @@ -39,22 +42,23 @@ BuildRequires: kidletime-devel BuildRequires: kio-devel BuildRequires: knotifyconfig-devel +BuildRequires: libkscreen2-devel >= %{version} BuildRequires: libxcb-devel BuildRequires: plasma5-workspace-devel >= %{version} BuildRequires: solid-devel BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xrandr) #PrepareForSleep is added to systemd 198, and with Plasma 5.2, will be unconditionaly called Requires: systemd >= 198 %requires_ge plasma5-workspace-libs +%if %{with lang} Recommends: %{name}-lang -Conflicts: kdebase4-workspace +%endif +Conflicts: kdebase4-workspace < 5.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,7 +68,7 @@ %lang_package %prep %setup -q -n powerdevil-%{version} -%patch1000 -p1 +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -97,8 +101,10 @@ %{_kf5_sharedir}/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service %{_kf5_sharedir}/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy +%if %{with lang} %files lang %defattr(-,root,root) %{_kf5_localedir}/ +%endif %changelog ++++++ old_action_names.patch ++++++ diff --git a/daemon/backends/upower/backlight_helper_actions.actions b/daemon/backends/upower/backlight_helper_actions.actions index ed120ab..02acf59 100644 --- a/daemon/backends/upower/backlight_helper_actions.actions +++ b/daemon/backends/upower/backlight_helper_actions.actions @@ -42,7 +42,7 @@ Name[zh_CN]=KDE Name[zh_TW]=KDE Icon=kde -[org.kde.powerdevil.backlighthelper.brightnessmax] +[org.kde.powerdevil.backlighthelper.brightnessvaluemax] Name=Get maximum brightness value Name[bs]=Dobij maksimalnu vrijednost osvjetljenja Name[ca]=Obtén el valor màxim de la lluminositat @@ -121,7 +121,7 @@ Description[zh_TW]=系統政策不允許您取得亮度設定。 Policy=yes PolicyInactive=yes -[org.kde.powerdevil.backlighthelper.brightness] +[org.kde.powerdevil.backlighthelper.brightnessvalue] Name=Get brightness Name[ar]=احصل على معلومات السطوع Name[bs]=Dobavi osvetljenje @@ -205,7 +205,7 @@ Description[zh_TW]=系統政策不允許您取得亮度設定。 Policy=yes PolicyInactive=yes -[org.kde.powerdevil.backlighthelper.setbrightness] +[org.kde.powerdevil.backlighthelper.setbrightnessvalue] Name=Set brightness Name[ar]=اضبط السطوع Name[bs]=Postavi osvetljenje diff --git a/daemon/backends/upower/backlighthelper.cpp b/daemon/backends/upower/backlighthelper.cpp index 83efec1..7a4273a 100644 --- a/daemon/backends/upower/backlighthelper.cpp +++ b/daemon/backends/upower/backlighthelper.cpp @@ -168,7 +168,7 @@ void BacklightHelper::initUsingSysctl() #endif } -ActionReply BacklightHelper::brightness(const QVariantMap &args) +ActionReply BacklightHelper::brightnessvalue(const QVariantMap &args) { Q_UNUSED(args); @@ -209,7 +209,7 @@ ActionReply BacklightHelper::brightness(const QVariantMap &args) return reply; } -ActionReply BacklightHelper::setbrightness(const QVariantMap &args) +ActionReply BacklightHelper::setbrightnessvalue(const QVariantMap &args) { ActionReply reply; @@ -283,7 +283,7 @@ ActionReply BacklightHelper::syspath(const QVariantMap &args) return reply; } -ActionReply BacklightHelper::brightnessmax(const QVariantMap &args) +ActionReply BacklightHelper::brightnessvaluemax(const QVariantMap &args) { Q_UNUSED(args); diff --git a/daemon/backends/upower/backlighthelper.h b/daemon/backends/upower/backlighthelper.h index b5ce7dc..7716a78 100644 --- a/daemon/backends/upower/backlighthelper.h +++ b/daemon/backends/upower/backlighthelper.h @@ -32,9 +32,9 @@ public: BacklightHelper(QObject *parent = nullptr); public slots: - ActionReply brightness(const QVariantMap &args); - ActionReply brightnessmax(const QVariantMap &args); - ActionReply setbrightness(const QVariantMap &args); + ActionReply brightnessvalue(const QVariantMap &args); + ActionReply brightnessvaluemax(const QVariantMap &args); + ActionReply setbrightnessvalue(const QVariantMap &args); ActionReply syspath(const QVariantMap &args); private: diff --git a/daemon/backends/upower/powerdevilupowerbackend.cpp b/daemon/backends/upower/powerdevilupowerbackend.cpp index 87b9cc7..56fa8eb 100644 --- a/daemon/backends/upower/powerdevilupowerbackend.cpp +++ b/daemon/backends/upower/powerdevilupowerbackend.cpp @@ -138,21 +138,21 @@ void PowerDevilUPowerBackend::init() if (!m_brightnessControl->isSupported()) { qCDebug(POWERDEVIL) << "Falling back to helper to get brightness"; - KAuth::Action brightnessAction("org.kde.powerdevil.backlighthelper.brightness"); + KAuth::Action brightnessAction("org.kde.powerdevil.backlighthelper.brightnessvalue"); brightnessAction.setHelperId(HELPER_ID); KAuth::ExecuteJob *brightnessJob = brightnessAction.execute(); if (!brightnessJob->exec()) { - qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightness failed"; + qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightnessvalue failed"; } else { m_cachedBrightnessMap.insert(Screen, brightnessJob->data()["brightness"].toFloat()); - KAuth::Action brightnessMaxAction("org.kde.powerdevil.backlighthelper.brightnessmax"); + KAuth::Action brightnessMaxAction("org.kde.powerdevil.backlighthelper.brightnessvaluemax"); brightnessMaxAction.setHelperId(HELPER_ID); KAuth::ExecuteJob *brightnessMaxJob = brightnessMaxAction.execute(); if (brightnessMaxJob->exec()) { m_brightnessMax = brightnessMaxJob->data()["brightnessmax"].toInt(); } else { - qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightnessmax failed"; + qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightnessvaluemax failed"; } KAuth::Action syspathAction("org.kde.powerdevil.backlighthelper.syspath"); @@ -384,7 +384,7 @@ void PowerDevilUPowerBackend::setBrightness(int value, PowerDevil::BackendInterf } } else { //qCDebug(POWERDEVIL) << "Falling back to helper to set brightness"; - KAuth::Action action("org.kde.powerdevil.backlighthelper.setbrightness"); + KAuth::Action action("org.kde.powerdevil.backlighthelper.setbrightnessvalue"); action.setHelperId(HELPER_ID); action.addArgument("brightness", value); KAuth::ExecuteJob *job = action.execute(); ++++++ powerdevil-5.2.2.tar.xz -> powerdevil-5.3.0.tar.xz ++++++ ++++ 45008 lines of diff (skipped)
