From df7c839759be7f2a4e329e41276ae1bd22f41246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 16 Jan 2015 12:30:56 +0100 Subject: [PATCH] Update to Plasma 5.1.95 (Plasma 5.2 beta) --- .gitignore | 1 + ...-workspace-fix-black-screen-on-start.patch | 61 --- plasma-workspace-kscreen-new-api-port.patch | 364 ------------------ ...rkspace-ksyncdbusenv-fix-dbus-1.8.14.patch | 30 -- plasma-workspace.spec | 66 ++-- sources | 2 +- 6 files changed, 46 insertions(+), 478 deletions(-) delete mode 100644 plasma-workspace-fix-black-screen-on-start.patch delete mode 100644 plasma-workspace-kscreen-new-api-port.patch delete mode 100644 plasma-workspace-ksyncdbusenv-fix-dbus-1.8.14.patch diff --git a/.gitignore b/.gitignore index 9fc74ec..44b0755 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /plasma-workspace-5.1.2.tar.xz +/plasma-workspace-5.1.95.tar.xz diff --git a/plasma-workspace-fix-black-screen-on-start.patch b/plasma-workspace-fix-black-screen-on-start.patch deleted file mode 100644 index cc6042d..0000000 --- a/plasma-workspace-fix-black-screen-on-start.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: David Edmundson -Date: Sun, 04 Jan 2015 16:12:36 +0000 -Subject: Uncondtionally monitor for all KAMD service status until we have first loaded -X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=8de060418e2c13057a443eb0aa997844466330b9 ---- -Uncondtionally monitor for all KAMD service status until we have first loaded - -There is an issue where as m_activityConsumer starts the -kactivitymanagerd, as KAMD is starting the serviceStatus will be not -running. - -Whilst we are loading the kscreen config, the event loop runs and we -might find KAMD has started. - -m_activityConsumer will change from "not running" to unknown, and might -still be unknown when the kscreen fetching is complete. - -If that happens we want to continue monitoring for state changes so we -can finally load when it is up - -BUG: 342431 ---- - - ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -226,9 +226,30 @@ - - unload(); - -- if (m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown) { -- connect(m_activityConsumer, SIGNAL(serviceStatusChanged(Consumer::ServiceStatus)), SLOT(load()), Qt::UniqueConnection); -- } -+ -+ /* -+ * we want to make an initial load once we have the initial screen config and we have loaded the activities _IF_ KAMD is running -+ * it is valid for KAMD to not be running. -+ * -+ * Potentially 2 async jobs -+ * -+ * here we connect for status changes from KAMD, and fetch the first config from kscreen. -+ * load() will check that we have a kscreen config, and m_activityConsumer->serviceStatus() is not loading (i.e not unknown) -+ * -+ * It might seem that we only need this connection if the activityConsumer is currently in state Unknown, however -+ * there is an issue where m_activityConsumer will start the kactivitymanagerd, as KAMD is starting the serviceStatus will be "not running" -+ * Whilst we are loading the kscreen config, the event loop runs and we might find KAMD has started. -+ * m_activityConsumer will change from "not running" to unknown, and might still be unknown when the kscreen fetching is complete. -+ * -+ * if that happens we want to continue monitoring for state changes, and only finally load when it is up. -+ * -+ * See https://bugs.kde.org/show_bug.cgi?id=342431 be careful about changing -+ * -+ * The unique connection makes sure we don't reload plasma if KAMD ever crashes and reloads, the signal is disconnected in the body of load -+ */ -+ -+ connect(m_activityConsumer, SIGNAL(serviceStatusChanged(Consumer::ServiceStatus)), SLOT(load()), Qt::UniqueConnection); -+ - connect(new KScreen::GetConfigOperation(KScreen::GetConfigOperation::NoEDID), &KScreen::GetConfigOperation::finished, - this, [=](KScreen::ConfigOperation *op) { - m_screenConfiguration = qobject_cast(op)->config(); - diff --git a/plasma-workspace-kscreen-new-api-port.patch b/plasma-workspace-kscreen-new-api-port.patch deleted file mode 100644 index 169d607..0000000 --- a/plasma-workspace-kscreen-new-api-port.patch +++ /dev/null @@ -1,364 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edfdf66..5cf725e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,8 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - # WARNING PlasmaQuick provides unversioned CMake config - find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) - find_package(KF5 REQUIRED COMPONENTS SysGuard) --find_package(KF5 REQUIRED COMPONENTS Screen) -+# Require KScreen >= 5.0.93 due to large API change -+find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen) - find_package(KF5TextEditor) - find_package(KWinDBusInterface CONFIG REQUIRED) - -diff --git a/shell/panelview.cpp b/shell/panelview.cpp -index 997f8d0..cf6357b 100644 ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #if HAVE_X11 - #include -@@ -100,10 +101,14 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent - m_strutsTimer.setSingleShot(true); - connect(&m_strutsTimer, &QTimer::timeout, - this, &PanelView::updateStruts); -- connect(m_corona->screensConfiguration(), &KScreen::Config::outputAdded, -- this, &PanelView::updateStruts); -- connect(m_corona->screensConfiguration(), &KScreen::Config::outputRemoved, -- this, &PanelView::updateStruts); -+ connect(m_corona->screensConfiguration().data(), &KScreen::Config::outputAdded, -+ this, [=] (const KScreen::OutputPtr &) { -+ updateStruts(); -+ }); -+ connect(m_corona->screensConfiguration().data(), &KScreen::Config::outputRemoved, -+ this, [=] (int) { -+ updateStruts(); -+ }); - - qmlRegisterType(); - engine()->rootContext()->setContextProperty("panel", this); -diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp -index 37a1cfd..00e0441 100644 ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -44,7 +44,9 @@ - #include - - #include --#include -+#include -+#include -+#include - - #include "config-ktexteditor.h" // HAVE_KTEXTEDITOR - -@@ -160,7 +162,6 @@ ShellCorona::ShellCorona(QObject *parent) - connect(m_activityConsumer, SIGNAL(activityRemoved(QString)), this, SLOT(activityRemoved(QString))); - - new Osd(this); -- m_screenConfiguration = KScreen::Config::current(); - - #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) - connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved); -@@ -227,9 +228,12 @@ void ShellCorona::setShell(const QString &shell) - - if (m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown) { - connect(m_activityConsumer, SIGNAL(serviceStatusChanged(Consumer::ServiceStatus)), SLOT(load()), Qt::UniqueConnection); -- } else { -- load(); - } -+ connect(new KScreen::GetConfigOperation(KScreen::GetConfigOperation::NoEDID), &KScreen::GetConfigOperation::finished, -+ this, [=](KScreen::ConfigOperation *op) { -+ m_screenConfiguration = qobject_cast(op)->config(); -+ load(); -+ }); - } - - QString ShellCorona::shell() const -@@ -237,7 +241,7 @@ QString ShellCorona::shell() const - return m_shell; - } - --bool outputLess(KScreen::Output *a, KScreen::Output *b) -+bool outputLess(const KScreen::OutputPtr &a, const KScreen::OutputPtr &b) - { - return ((a->isEnabled() && !b->isEnabled()) - || (a->isEnabled() == b->isEnabled() && (a->isPrimary() && !b->isPrimary())) -@@ -245,9 +249,9 @@ bool outputLess(KScreen::Output *a, KScreen::Output *b) - || (a->pos().x() == b->pos().x() && a->pos().y() < b->pos().y())))); - } - --static QList sortOutputs(const QHash &outputs) -+static QList sortOutputs(const KScreen::OutputList &outputs) - { -- QList ret = outputs.values(); -+ QList ret = outputs.values(); - std::sort(ret.begin(), ret.end(), outputLess); - return ret; - } -@@ -255,7 +259,8 @@ static QList sortOutputs(const QHash &o - void ShellCorona::load() - { - if (m_shell.isEmpty() || -- m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown) { -+ m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown || -+ !m_screenConfiguration) { - return; - } - -@@ -292,10 +297,11 @@ void ShellCorona::load() - - KScreen::ConfigMonitor::instance()->addConfig(m_screenConfiguration); - //we're not going through the connectedOutputs because we need to connect to all outputs -- for (KScreen::Output *output : sortOutputs(m_screenConfiguration->outputs())) { -+ for (const KScreen::OutputPtr &output : sortOutputs(m_screenConfiguration->outputs())) { - addOutput(output); - } -- connect(m_screenConfiguration, &KScreen::Config::outputAdded, this, &ShellCorona::addOutput); -+ connect(m_screenConfiguration.data(), &KScreen::Config::outputAdded, this, &ShellCorona::addOutput); -+ connect(m_screenConfiguration.data(), &KScreen::Config::primaryOutputChanged, this, &ShellCorona::primaryOutputChanged); - - if (!m_waitingPanels.isEmpty()) { - m_waitingPanelsTimer.start(); -@@ -321,7 +327,7 @@ void ShellCorona::primaryOutputChanged() - return; - } - -- KScreen::Output *output = findPrimaryOutput(); -+ const KScreen::OutputPtr output = m_screenConfiguration->primaryOutput(); - if (!output) { - return; - } -@@ -367,7 +373,7 @@ void ShellCorona::screenInvariants() const - Q_ASSERT(!m_loading); - Q_ASSERT(m_views.count() <= QGuiApplication::screens().count()); - QScreen *s = m_views.isEmpty() ? nullptr : m_views[0]->screen(); -- KScreen::Output *primaryOutput = findPrimaryOutput(); -+ const KScreen::OutputPtr primaryOutput = m_screenConfiguration->primaryOutput(); - if (!s) { - qWarning() << "error: couldn't find primary output" << primaryOutput; - return; -@@ -400,7 +406,7 @@ void ShellCorona::screenInvariants() const - ++i; - } - -- foreach (KScreen::Output* out, m_redundantOutputs) { -+ foreach (const KScreen::OutputPtr &out, m_redundantOutputs) { - Q_ASSERT(isOutputRedundant(out)); - } - -@@ -520,7 +526,7 @@ QRect ShellCorona::screenGeometry(int id) const - { - if (id >= m_views.count() || id < 0) { - qWarning() << "requesting unexisting screen" << id; -- QScreen *s = outputToScreen(findPrimaryOutput()); -+ QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput()); - return s ? s->geometry() : QRect(); - } - return m_views[id]->geometry(); -@@ -531,7 +537,7 @@ QRegion ShellCorona::availableScreenRegion(int id) const - if (id >= m_views.count() || id < 0) { - //each screen should have a view - qWarning() << "requesting unexisting screen" << id; -- QScreen *s = outputToScreen(findPrimaryOutput()); -+ QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput()); - return s ? s->availableGeometry() : QRegion(); - } - DesktopView *view = m_views[id]; -@@ -552,7 +558,7 @@ QRect ShellCorona::availableScreenRect(int id) const - if (id >= m_views.count() || id < 0) { - //each screen should have a view - qWarning() << "requesting unexisting screen" << id; -- QScreen *s = outputToScreen(findPrimaryOutput()); -+ QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput()); - return s ? s->availableGeometry() : QRect(); - } - -@@ -678,17 +684,17 @@ void ShellCorona::screenRemoved(QScreen* screen) - - void ShellCorona::outputEnabledChanged() - { -- addOutput(qobject_cast(sender())); -+ addOutput(KScreen::OutputPtr(qobject_cast(sender()), [](void*){})); - } - --bool ShellCorona::isOutputRedundant(KScreen::Output *screen) const -+bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const - { - Q_ASSERT(screen->currentMode()); - const QRect geometry = screen->geometry(); - - //FIXME: QScreen doesn't have any idea of "this qscreen is clone of this other one - //so this ultra inefficient heuristic has to stay until we have a slightly better api -- foreach (const KScreen::Output *s, m_screenConfiguration->connectedOutputs()) { -+ foreach (const KScreen::OutputPtr &s, m_screenConfiguration->connectedOutputs()) { - if (screen == s || !s->isEnabled() || !s->currentMode()) { - continue; - } -@@ -711,7 +717,7 @@ void ShellCorona::reconsiderOutputs() - return; - } - -- foreach (KScreen::Output *out, m_screenConfiguration->connectedOutputs()) { -+ foreach (const KScreen::OutputPtr &out, m_screenConfiguration->connectedOutputs()) { - if (!out->isEnabled() || !out->currentMode()) { - // qDebug() << "skip screen" << out << desktopForScreen(outputToScreen(out)); - continue; -@@ -737,16 +743,21 @@ void ShellCorona::reconsiderOutputs() - CHECK_SCREEN_INVARIANTS - } - --void ShellCorona::addOutput(KScreen::Output *output) -+void ShellCorona::addOutput(const KScreen::OutputPtr &output) - { - if (!output) { - return; - } - -- connect(output, &KScreen::Output::isEnabledChanged, this, &ShellCorona::outputEnabledChanged, Qt::UniqueConnection); -- connect(output, &KScreen::Output::posChanged, &m_reconsiderOutputsTimer, static_cast(&QTimer::start), Qt::UniqueConnection); -- connect(output, &KScreen::Output::currentModeIdChanged, &m_reconsiderOutputsTimer, static_cast(&QTimer::start), Qt::UniqueConnection); -- connect(output, &KScreen::Output::isPrimaryChanged, this, &ShellCorona::primaryOutputChanged, Qt::UniqueConnection); -+ connect(output.data(), &KScreen::Output::isEnabledChanged, -+ this, &ShellCorona::outputEnabledChanged, -+ Qt::UniqueConnection); -+ connect(output.data(), &KScreen::Output::posChanged, -+ &m_reconsiderOutputsTimer, static_cast(&QTimer::start), -+ Qt::UniqueConnection); -+ connect(output.data(), &KScreen::Output::currentModeIdChanged, -+ &m_reconsiderOutputsTimer, static_cast(&QTimer::start), -+ Qt::UniqueConnection); - - if (!output->isEnabled()) { - m_redundantOutputs.remove(output); -@@ -766,7 +777,7 @@ void ShellCorona::addOutput(KScreen::Output *output) - - int insertPosition = 0; - foreach (DesktopView *view, m_views) { -- KScreen::Output *out = screenToOutput(view->screen()); -+ const KScreen::OutputPtr out = screenToOutput(view->screen()); - if (outputLess(output, out)) { - break; - } -@@ -807,7 +818,7 @@ void ShellCorona::addOutput(KScreen::Output *output) - CHECK_SCREEN_INVARIANTS - } - --QScreen *ShellCorona::outputToScreen(KScreen::Output *output) const -+QScreen *ShellCorona::outputToScreen(const KScreen::OutputPtr &output) const - { - if (!output) { - return nullptr; -@@ -822,25 +833,15 @@ QScreen *ShellCorona::outputToScreen(KScreen::Output *output) const - return nullptr; - } - --KScreen::Output *ShellCorona::screenToOutput(QScreen *screen) const -+KScreen::OutputPtr ShellCorona::screenToOutput(QScreen *screen) const - { -- foreach (KScreen::Output *output, m_screenConfiguration->connectedOutputs()) { -+ foreach (const KScreen::OutputPtr &output, m_screenConfiguration->connectedOutputs()) { - if (screen->name() == output->name()) { - return output; - } - } - -- return nullptr; --} -- --KScreen::Output *ShellCorona::findPrimaryOutput() const --{ -- foreach (KScreen::Output *output, m_screenConfiguration->connectedOutputs()) { -- if (output->isPrimary()) -- return output; -- } -- -- return nullptr; -+ return KScreen::OutputPtr(); - } - - QScreen* ShellCorona::insertScreen(QScreen *screen, int idx) -@@ -1506,7 +1507,7 @@ void ShellCorona::desktopContainmentDestroyed(QObject *obj) - } - } - --KScreen::Config* ShellCorona::screensConfiguration() const -+KScreen::ConfigPtr ShellCorona::screensConfiguration() const - { - return m_screenConfiguration; - } -diff --git a/shell/shellcorona.h b/shell/shellcorona.h -index 5e97e02..37f8b0e 100644 ---- a/shell/shellcorona.h -+++ b/shell/shellcorona.h -@@ -30,6 +30,8 @@ - - #include - -+#include -+ - class Activity; - class DesktopView; - class PanelView; -@@ -49,7 +51,6 @@ namespace KDeclarative - - namespace KScreen { - class Output; -- class Config; - } // namespace KScreen - - namespace Plasma -@@ -90,7 +91,7 @@ public: - - Plasma::Containment *setContainmentTypeForScreen(int screen, const QString &plugin); - -- KScreen::Config *screensConfiguration() const; -+ KScreen::ConfigPtr screensConfiguration() const; - - QScreen *screenForId(int screenId) const; - void remove(DesktopView *desktopView); -@@ -166,7 +167,7 @@ private Q_SLOTS: - void populateAddPanelsMenu(); - - void outputEnabledChanged(); -- void addOutput(KScreen::Output *output); -+ void addOutput(const KScreen::OutputPtr &output); - void primaryOutputChanged(); - - void activityOpened(); -@@ -179,12 +180,11 @@ private Q_SLOTS: - void screenRemoved(QScreen* screen); - - private: -- QScreen *outputToScreen(KScreen::Output *output) const; -- KScreen::Output *screenToOutput(QScreen *screen) const; -- KScreen::Output *findPrimaryOutput() const; -+ QScreen *outputToScreen(const KScreen::OutputPtr &output) const; -+ KScreen::OutputPtr screenToOutput(QScreen *screen) const; - QScreen *insertScreen(QScreen *screen, int idx); - void removeView(int idx); -- bool isOutputRedundant(KScreen::Output *output) const; -+ bool isOutputRedundant(const KScreen::OutputPtr &output) const; - void reconsiderOutputs(); - QList panelsForScreen(QScreen *screen) const; - DesktopView* desktopForScreen(QScreen *screen) const; -@@ -207,11 +207,11 @@ private: - QAction *m_addPanelAction; - QMenu *m_addPanelsMenu; - Plasma::Package m_lookAndFeelPackage; -- QSet m_redundantOutputs; -+ QSet m_redundantOutputs; - QList m_alternativesObjects; - KDeclarative::QmlObject *m_interactiveConsole; - -- KScreen::Config *m_screenConfiguration; -+ KScreen::ConfigPtr m_screenConfiguration; - QTimer m_waitingPanelsTimer; - QTimer m_appConfigSyncTimer; - QTimer m_reconsiderOutputsTimer; diff --git a/plasma-workspace-ksyncdbusenv-fix-dbus-1.8.14.patch b/plasma-workspace-ksyncdbusenv-fix-dbus-1.8.14.patch deleted file mode 100644 index cc76817..0000000 --- a/plasma-workspace-ksyncdbusenv-fix-dbus-1.8.14.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/startkde/ksyncdbusenv/ksyncdbusenv.cpp b/startkde/ksyncdbusenv/ksyncdbusenv.cpp -index 05ffb0e..8a01e7d 100644 ---- a/startkde/ksyncdbusenv/ksyncdbusenv.cpp -+++ b/startkde/ksyncdbusenv/ksyncdbusenv.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - typedef QMap EnvMap; - Q_DECLARE_METATYPE(EnvMap) -@@ -39,7 +40,7 @@ int main(int argc, char **argv) - } - - QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"), -- QStringLiteral("/"), -+ QStringLiteral("/org/freedesktop/DBus"), - QStringLiteral("org.freedesktop.DBus"), - QStringLiteral("UpdateActivationEnvironment")); - qDBusRegisterMetaType(); -@@ -47,5 +48,8 @@ int main(int argc, char **argv) - - QDBusPendingCall reply = QDBusConnection::sessionBus().asyncCall(msg); - reply.waitForFinished(); -+ if (reply.isError()) { -+ qDebug() << reply.error().name() << reply.error().message(); -+ } - return reply.isError() ? 1 : 0; - } diff --git a/plasma-workspace.spec b/plasma-workspace.spec index fb31150..e592e80 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -1,18 +1,23 @@ Name: plasma-workspace -Version: 5.1.2 -Release: 3%{?dist} -Summary: Plasma workspace applications and applets +Version: 5.1.95 +Release: 3.beta%{?dist} +Summary: Plasma workspace, applications and applets License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace -Source0: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz # This goes to PAM Source10: kde # Patches -Patch0: plasma-workspace-kscreen-new-api-port.patch -Patch1: plasma-workspace-fix-black-screen-on-start.patch +Patch0: plasma-workspace-startkde-use-qdbus-qt5.patch # udev BuildRequires: zlib-devel @@ -81,15 +86,19 @@ BuildRequires: kf5-ksysguard-devel BuildRequires: kf5-kscreen-devel BuildRequires: kf5-baloo-devel -BuildRequires: kwin-devel +BuildRequires: kf5-kwayland-devel +BuildRequires: libwayland-client-devel >= 1.3.0 +BuildRequires: libwayland-server-devel >= 1.3.0 -# FIXME: Missing kf5-kdepimlibs-umbrella +BuildRequires: kwin-devel BuildRequires: chrpath +BuildRequires: desktop-file-utils # Optional BuildRequires: kf5-kactivities-devel + # HACK: Should be kf5-kactivities-runtime, but that conflicts with kactivities, # so we requre KDE4 KActivities (it's dbus runtime dep, so no problem) Requires: kactivities @@ -102,11 +111,15 @@ Requires: qt5-qtgraphicaleffects Requires: kf5-filesystem Requires: kf5-baloo +# Without the platformtheme plugins we get broken fonts +Requires: kf5-frameworkintegration + # startkde Requires: coreutils Requires: dbus-x11 Requires: socat Requires: xmessage +Requires: qt5-qttools Requires: xorg-x11-utils Requires: xorg-x11-server-utils @@ -129,10 +142,6 @@ Obsoletes: kde-workspace < 5.0.0-1 # There was circular dependency between kde-workspace and -libs, so remove explictly # both. This is fixed in latest kde-workspace Obsoletes: kde-workspace-libs < 5.0.0-1 -Obsoletes: kdeplasma-addons < 5.0.0-1 -# Hmm, really? This is needed for smooth upgrade, but something else should do this, -# maybe plasma-dsektop? -Obsoletes: plasma-scriptengine-python < 5.0.0-1 %description Plasma 5 libraries and runtime components @@ -156,16 +165,13 @@ Documentation and user manuals for %{name}. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .kscreen -%patch1 -p1 -b .blackscreen +%patch0 -p1 -b .startkde %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. \ - -DCMAKE_INSTALL_FULL_LIBEXECDIR=${_libexecdir} \ - -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF=${_kf5_libexecdir} +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -175,15 +181,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} chrpath --delete %{buildroot}/%{_kf5_qtplugindir}/phonon_platform/kde.so -# Makes kcheckpass work +# Make kcheckpass work install -m455 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde %find_lang plasmaworkspace5 --with-qt --with-kde --all-name %check -desktop-file-validate %{_datadir}/applications/{plasma-windowed,org.kde.klipper}.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/{plasma-windowed,org.kde.klipper}.desktop -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f plasmaworkspace5.lang @@ -211,6 +217,7 @@ desktop-file-validate %{_datadir}/applications/{plasma-windowed,org.kde.klipper} %{_datadir}/drkonqi/mappings %{_datadir}/drkonqi/pics/*.png %{_sysconfdir}/xdg/*.knsrc +%{_sysconfdir}/xdg/taskmanagerrulesrc %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/desktop-directories/*.directory %{_datadir}/dbus-1/services/*.service @@ -229,7 +236,6 @@ desktop-file-validate %{_datadir}/applications/{plasma-windowed,org.kde.klipper} %config %{_sysconfdir}/pam.d/kde %files doc -# %doc COPYING COPYING.DOC COPYING.LIB README README.pam %{_datadir}/doc/HTML/en/* %files devel @@ -252,11 +258,27 @@ desktop-file-validate %{_datadir}/applications/{plasma-windowed,org.kde.klipper} %changelog +* Wed Jan 14 2015 Daniel Vrátil - 5.1.95-3.beta +- Requires: kf5-frameworkintegration (provides platformtheme plugin) + +* Wed Jan 14 2015 Daniel Vrátil - 5.1.95-2.beta +- BR: kf5-kscreen-devel (renamed) + +* Tue Jan 13 2015 Daniel Vrátil - 5.1.95-1.beta +- Plasma 5.1.95 Beta + +* Mon Jan 12 2015 Daniel Vrátil - 5.1.2-5 +- Add upstream patch to make ksyncdbusenv work with dbus-1.8.14 + +* Fri Jan 09 2015 Daniel Vrátil - 5.1.2-4 +- Requires: qt5-qttools (for dbus-qt5) + * Wed Jan 07 2015 Jan Grulich - 5.1.2-3 - Omit "5" from pkg summary Drop config macro for files installed to /etc/xdg Move /usr/share/dbus-1/interfaces/*.xml stuff to main package Validate .desktop files + look for qdbus-qt5 in startkde instead of qdbus * Mon Jan 05 2015 Daniel Vrátil - 5.1.2-2 - add upstream patch to fix black screen on start @@ -307,7 +329,7 @@ desktop-file-validate %{_datadir}/applications/{plasma-windowed,org.kde.klipper} * Tue May 20 2014 Daniel Vrátil - 4.96.0-6.20140519gita85f5bc - Add LIBEXEC_PATH to kde5 profile to fix drkonqi lookup -- Fix install +- Fix install * Mon May 19 2014 Daniel Vrátil - 4.96.0-3.20140519gita85f5bc - Update to latest git snapshot diff --git a/sources b/sources index 9b659ec..922cf01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a01835179b25e3a7ff644fd7e52ec96 plasma-workspace-5.1.2.tar.xz +247127e7e857eaaeb4f6009ca527af0b plasma-workspace-5.1.95.tar.xz