plasma-workspace: update to 5.2.90
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -18,13 +18,13 @@ The remaining components will be ported in future commits.
|
||||
CMakeLists.txt | 21 +-
|
||||
kglobalaccel/config-kglobalaccel.h.cmake | 1 +
|
||||
ksplash/ksplashqml/CMakeLists.txt | 24 ++
|
||||
ksplash/ksplashqml/SplashApp.cpp | 129 +++++---
|
||||
ksplash/ksplashqml/SplashApp.h | 17 +-
|
||||
ksplash/ksplashqml/SplashAppWayland.cpp | 78 +++++
|
||||
ksplash/ksplashqml/SplashAppWayland_p.h | 47 +++
|
||||
ksplash/ksplashqml/SplashAppX11.cpp | 30 ++
|
||||
ksplash/ksplashqml/SplashAppX11_p.h | 33 ++
|
||||
ksplash/ksplashqml/SplashApp_p.h | 56 ++++
|
||||
ksplash/ksplashqml/splashapp.cpp | 129 +++++---
|
||||
ksplash/ksplashqml/splashapp.h | 17 +-
|
||||
ksplash/ksplashqml/splashappwayland.cpp | 78 +++++
|
||||
ksplash/ksplashqml/splashappwayland_p.h | 47 +++
|
||||
ksplash/ksplashqml/splashappx11.cpp | 30 ++
|
||||
ksplash/ksplashqml/splashappx11_p.h | 33 ++
|
||||
ksplash/ksplashqml/splashapp_p.h | 56 ++++
|
||||
ksplash/ksplashqml/config-ksplashqml.h.cmake | 2 +
|
||||
libkworkspace/config-libkworkspace.h.cmake | 7 +-
|
||||
libtaskmanager/CMakeLists.txt | 8 +-
|
||||
@@ -61,11 +61,11 @@ The remaining components will be ported in future commits.
|
||||
shell/platform/waylandinterface.h | 47 +++
|
||||
shell/shellmanager.cpp | 12 +
|
||||
45 files changed, 2236 insertions(+), 743 deletions(-)
|
||||
create mode 100644 ksplash/ksplashqml/SplashAppWayland.cpp
|
||||
create mode 100644 ksplash/ksplashqml/SplashAppWayland_p.h
|
||||
create mode 100644 ksplash/ksplashqml/SplashAppX11.cpp
|
||||
create mode 100644 ksplash/ksplashqml/SplashAppX11_p.h
|
||||
create mode 100644 ksplash/ksplashqml/SplashApp_p.h
|
||||
create mode 100644 ksplash/ksplashqml/splashappwayland.cpp
|
||||
create mode 100644 ksplash/ksplashqml/splashappwayland_p.h
|
||||
create mode 100644 ksplash/ksplashqml/splashappx11.cpp
|
||||
create mode 100644 ksplash/ksplashqml/splashappx11_p.h
|
||||
create mode 100644 ksplash/ksplashqml/splashapp_p.h
|
||||
create mode 100644 ksplash/ksplashqml/config-ksplashqml.h.cmake
|
||||
create mode 100644 libtaskmanager/task_wayland.cpp
|
||||
create mode 100644 shell/platform/platformdesktopview.cpp
|
||||
@@ -163,21 +163,21 @@ index 16c58a0..59a1a3c 100644
|
||||
+
|
||||
set(ksplashqml_SRCS
|
||||
main.cpp
|
||||
SplashApp.cpp
|
||||
SplashWindow.cpp
|
||||
splashapp.cpp
|
||||
splashwindow.cpp
|
||||
)
|
||||
|
||||
+if(HAVE_X11)
|
||||
+ set(ksplashqml_SRCS
|
||||
+ ${ksplashqml_SRCS}
|
||||
+ SplashAppX11.cpp
|
||||
+ splashappx11.cpp
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
+if(HAVE_WAYLAND)
|
||||
+ set(ksplashqml_SRCS
|
||||
+ ${ksplashqml_SRCS}
|
||||
+ SplashAppWayland.cpp
|
||||
+ splashappwayland.cpp
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
@@ -195,10 +195,10 @@ index 16c58a0..59a1a3c 100644
|
||||
install(TARGETS ksplashqml ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(FILES org.kde.KSplash.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
|
||||
diff --git a/ksplash/ksplashqml/SplashApp.cpp b/ksplash/ksplashqml/SplashApp.cpp
|
||||
diff --git a/ksplash/ksplashqml/splashapp.cpp b/ksplash/ksplashqml/splashapp.cpp
|
||||
index e68db1b..4e1ba55 100644
|
||||
--- a/ksplash/ksplashqml/SplashApp.cpp
|
||||
+++ b/ksplash/ksplashqml/SplashApp.cpp
|
||||
--- a/ksplash/ksplashqml/splashapp.cpp
|
||||
+++ b/ksplash/ksplashqml/splashapp.cpp
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
|
||||
@@ -209,17 +209,17 @@ index e68db1b..4e1ba55 100644
|
||||
* it under the terms of the GNU General Public License version 2,
|
||||
@@ -20,6 +21,16 @@
|
||||
|
||||
#include "SplashWindow.h"
|
||||
#include "SplashApp.h"
|
||||
+#include "SplashApp_p.h"
|
||||
#include "splashwindow.h"
|
||||
#include "splashapp.h"
|
||||
+#include "splashapp_p.h"
|
||||
+
|
||||
+#include "config-ksplashqml.h"
|
||||
+
|
||||
+#if HAVE_X11
|
||||
+# include "SplashAppX11_p.h"
|
||||
+# include "splashappx11_p.h"
|
||||
+#endif
|
||||
+#if HAVE_WAYLAND
|
||||
+# include "SplashAppWayland_p.h"
|
||||
+# include "splashappwayland_p.h"
|
||||
+#endif
|
||||
|
||||
#include <QPixmap>
|
||||
@@ -398,10 +398,10 @@ index e68db1b..4e1ba55 100644
|
||||
w->deleteLater();
|
||||
});
|
||||
}
|
||||
diff --git a/ksplash/ksplashqml/SplashApp.h b/ksplash/ksplashqml/SplashApp.h
|
||||
diff --git a/ksplash/ksplashqml/splashapp.h b/ksplash/ksplashqml/splashapp.h
|
||||
index 1be9d0b..86d86c7 100644
|
||||
--- a/ksplash/ksplashqml/SplashApp.h
|
||||
+++ b/ksplash/ksplashqml/SplashApp.h
|
||||
--- a/ksplash/ksplashqml/splashapp.h
|
||||
+++ b/ksplash/ksplashqml/splashapp.h
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
|
||||
@@ -416,7 +416,7 @@ index 1be9d0b..86d86c7 100644
|
||||
#include <QGuiApplication>
|
||||
-#include <QBasicTimer>
|
||||
-#include <QDateTime>
|
||||
+#include "SplashApp_p.h"
|
||||
+#include "splashapp_p.h"
|
||||
|
||||
-class SplashWindow;
|
||||
+class SplashAppPrivate;
|
||||
@@ -448,11 +448,11 @@ index 1be9d0b..86d86c7 100644
|
||||
|
||||
private Q_SLOTS:
|
||||
void adoptScreen(QScreen*);
|
||||
diff --git a/ksplash/ksplashqml/SplashAppWayland.cpp b/ksplash/ksplashqml/SplashAppWayland.cpp
|
||||
diff --git a/ksplash/ksplashqml/splashappwayland.cpp b/ksplash/ksplashqml/splashappwayland.cpp
|
||||
new file mode 100644
|
||||
index 0000000..aa21b8f
|
||||
--- /dev/null
|
||||
+++ b/ksplash/ksplashqml/SplashAppWayland.cpp
|
||||
+++ b/ksplash/ksplashqml/splashappwayland.cpp
|
||||
@@ -0,0 +1,78 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
||||
@@ -473,9 +473,9 @@ index 0000000..aa21b8f
|
||||
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
+ */
|
||||
+
|
||||
+#include "SplashApp.h"
|
||||
+#include "SplashAppWayland_p.h"
|
||||
+#include "SplashWindow.h"
|
||||
+#include "splashapp.h"
|
||||
+#include "splashappwayland_p.h"
|
||||
+#include "splashwindow.h"
|
||||
+
|
||||
+#include <QGuiApplication>
|
||||
+#include <qpa/qplatformnativeinterface.h>
|
||||
@@ -531,12 +531,12 @@ index 0000000..aa21b8f
|
||||
+ m_plasmaShell->desktopReady();
|
||||
+}
|
||||
+
|
||||
+#include "SplashAppWayland.moc"
|
||||
diff --git a/ksplash/ksplashqml/SplashAppWayland_p.h b/ksplash/ksplashqml/SplashAppWayland_p.h
|
||||
+#include "splashappwayland.moc"
|
||||
diff --git a/ksplash/ksplashqml/splashappwayland_p.h b/ksplash/ksplashqml/splashappwayland_p.h
|
||||
new file mode 100644
|
||||
index 0000000..24d9df8
|
||||
--- /dev/null
|
||||
+++ b/ksplash/ksplashqml/SplashAppWayland_p.h
|
||||
+++ b/ksplash/ksplashqml/splashappwayland_p.h
|
||||
@@ -0,0 +1,47 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
||||
@@ -562,7 +562,7 @@ index 0000000..24d9df8
|
||||
+
|
||||
+#include <QtCore/QObject>
|
||||
+
|
||||
+#include "SplashApp_p.h"
|
||||
+#include "splashapp_p.h"
|
||||
+
|
||||
+namespace KWayland {
|
||||
+ namespace Client {
|
||||
@@ -585,11 +585,11 @@ index 0000000..24d9df8
|
||||
+};
|
||||
+
|
||||
+#endif // SPLASH_APP_WAYLAND_P_H
|
||||
diff --git a/ksplash/ksplashqml/SplashAppX11.cpp b/ksplash/ksplashqml/SplashAppX11.cpp
|
||||
diff --git a/ksplash/ksplashqml/splashappx11.cpp b/ksplash/ksplashqml/splashappx11.cpp
|
||||
new file mode 100644
|
||||
index 0000000..3464eb3
|
||||
--- /dev/null
|
||||
+++ b/ksplash/ksplashqml/SplashAppX11.cpp
|
||||
+++ b/ksplash/ksplashqml/splashappx11.cpp
|
||||
@@ -0,0 +1,30 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
||||
@@ -610,7 +610,7 @@ index 0000000..3464eb3
|
||||
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
+ */
|
||||
+
|
||||
+#include "SplashAppX11_p.h"
|
||||
+#include "splashappx11_p.h"
|
||||
+
|
||||
+SplashAppX11::SplashAppX11(SplashApp *q)
|
||||
+ : SplashAppPrivate(q)
|
||||
@@ -621,11 +621,11 @@ index 0000000..3464eb3
|
||||
+{
|
||||
+ setup();
|
||||
+}
|
||||
diff --git a/ksplash/ksplashqml/SplashAppX11_p.h b/ksplash/ksplashqml/SplashAppX11_p.h
|
||||
diff --git a/ksplash/ksplashqml/splashappx11_p.h b/ksplash/ksplashqml/splashappx11_p.h
|
||||
new file mode 100644
|
||||
index 0000000..4812082
|
||||
--- /dev/null
|
||||
+++ b/ksplash/ksplashqml/SplashAppX11_p.h
|
||||
+++ b/ksplash/ksplashqml/splashappx11_p.h
|
||||
@@ -0,0 +1,33 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
||||
@@ -649,7 +649,7 @@ index 0000000..4812082
|
||||
+#ifndef SPLASH_APP_X11_P_H
|
||||
+#define SPLASH_APP_X11_P_H
|
||||
+
|
||||
+#include "SplashApp_p.h"
|
||||
+#include "splashapp_p.h"
|
||||
+
|
||||
+class SplashAppX11 : public SplashAppPrivate
|
||||
+{
|
||||
@@ -660,11 +660,11 @@ index 0000000..4812082
|
||||
+};
|
||||
+
|
||||
+#endif // SPLASH_APP_X11_P_H
|
||||
diff --git a/ksplash/ksplashqml/SplashApp_p.h b/ksplash/ksplashqml/SplashApp_p.h
|
||||
diff --git a/ksplash/ksplashqml/splashapp_p.h b/ksplash/ksplashqml/splashapp_p.h
|
||||
new file mode 100644
|
||||
index 0000000..c4a46a3
|
||||
--- /dev/null
|
||||
+++ b/ksplash/ksplashqml/SplashApp_p.h
|
||||
+++ b/ksplash/ksplashqml/splashapp_p.h
|
||||
@@ -0,0 +1,56 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
|
||||
@@ -1184,15 +1184,15 @@ index 1b07261..480af49 100644
|
||||
* Copyright 2013 Marco Martin <mart@kde.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@@ -25,6 +26,7 @@
|
||||
@@ -24,6 +25,7 @@
|
||||
#include "panelconfigview.h"
|
||||
#include <QtCore/qpointer.h>
|
||||
|
||||
class ShellCorona;
|
||||
+class PlatformDesktopView;
|
||||
|
||||
class DesktopView : public PlasmaQuick::View
|
||||
{
|
||||
@@ -79,6 +81,7 @@ private:
|
||||
@@ -78,6 +80,7 @@ private:
|
||||
QPointer<QScreen> m_oldScreen;
|
||||
bool m_dashboardShown : 1;
|
||||
WindowType m_windowType;
|
||||
|
||||
@@ -15,15 +15,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 582b58e..d86e815 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -21,7 +21,6 @@ find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
|
||||
find_package(KF5 REQUIRED COMPONENTS SysGuard)
|
||||
find_package(KF5 REQUIRED COMPONENTS Screen)
|
||||
@@ -23,7 +23,6 @@ find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen)
|
||||
# Baloo has a different version scheme than KF5 for now
|
||||
find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
|
||||
find_package(KF5TextEditor)
|
||||
-find_package(KWinDBusInterface CONFIG REQUIRED)
|
||||
find_package(KF5WebKit)
|
||||
|
||||
include(KDEInstallDirs)
|
||||
include(KDECMakeSettings)
|
||||
@@ -121,6 +120,7 @@ add_subdirectory(freespacenotifier)
|
||||
@@ -144,6 +143,7 @@ add_subdirectory(freespacenotifier)
|
||||
add_subdirectory(klipper)
|
||||
add_subdirectory(krunner)
|
||||
if(HAVE_X11)
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
From e75ca437349155a3a40eea7e688657065efc777d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 28 Jan 2015 10:39:36 +0100
|
||||
Subject: [PATCH] fix missuse of HAVE_X11
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
fixes in X11-less environments:
|
||||
|
||||
| shell/scripting/appinterface.cpp:41:22: fatal error: X11/Xlib.h: No such file or directory
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
shell/scripting/appinterface.cpp | 4 ++--
|
||||
soliduiserver/soliduiserver.cpp | 2 +-
|
||||
startkde/kcminit/main.cpp | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/shell/scripting/appinterface.cpp b/shell/scripting/appinterface.cpp
|
||||
index 4153c9b..6be429e 100644
|
||||
--- a/shell/scripting/appinterface.cpp
|
||||
+++ b/shell/scripting/appinterface.cpp
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_X11
|
||||
+#if HAVE_X11
|
||||
#include <X11/Xlib.h>
|
||||
#include <fixx11h.h>
|
||||
#endif
|
||||
@@ -137,7 +137,7 @@ int AppInterface::multiheadScreen() const
|
||||
{
|
||||
int id = -1;
|
||||
|
||||
-#ifdef HAVE_X11
|
||||
+#if HAVE_X11
|
||||
if (multihead()) {
|
||||
// with multihead, we "lie" and say that screen 0 is the default screen, in fact, we pretend
|
||||
// we have only one screen at all
|
||||
diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
|
||||
index 2af2555..1afe2d8 100644
|
||||
--- a/soliduiserver/soliduiserver.cpp
|
||||
+++ b/soliduiserver/soliduiserver.cpp
|
||||
@@ -222,7 +222,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI
|
||||
|
||||
KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent
|
||||
|
||||
-#ifdef HAVE_X11
|
||||
+#if HAVE_X11
|
||||
if (modal) {
|
||||
KWindowSystem::setState(dialog->winId(), NET::Modal);
|
||||
} else {
|
||||
diff --git a/startkde/kcminit/main.cpp b/startkde/kcminit/main.cpp
|
||||
index 4724323..0fa2dda 100644
|
||||
--- a/startkde/kcminit/main.cpp
|
||||
+++ b/startkde/kcminit/main.cpp
|
||||
@@ -163,7 +163,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
|
||||
// This key has no GUI apparently
|
||||
KConfig _config( "kcmdisplayrc" );
|
||||
KConfigGroup config(&_config, "X11");
|
||||
-#ifdef HAVE_X11
|
||||
+#if HAVE_X11
|
||||
bool multihead = !config.readEntry( "disableMultihead", false) &&
|
||||
(QGuiApplication::screens().count() > 1);
|
||||
#else
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From b3c1c404169a768dc108b835056405404eff0bea Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 28 Jan 2015 11:14:17 +0100
|
||||
Subject: [PATCH] dataengines/mouse: fix build in X11-less environments
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
dataengines/mouse/CMakeLists.txt | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dataengines/mouse/CMakeLists.txt b/dataengines/mouse/CMakeLists.txt
|
||||
index b744a6c..e9d56a3 100644
|
||||
--- a/dataengines/mouse/CMakeLists.txt
|
||||
+++ b/dataengines/mouse/CMakeLists.txt
|
||||
@@ -11,16 +11,21 @@ endif ()
|
||||
add_library(plasma_engine_mouse MODULE ${mouse_engine_SRCS})
|
||||
target_link_libraries(plasma_engine_mouse
|
||||
Qt5::Widgets
|
||||
- Qt5::X11Extras
|
||||
KF5::Plasma
|
||||
KF5::WindowSystem
|
||||
- ${X11_LIBRARIES}
|
||||
)
|
||||
|
||||
if (X11_Xfixes_FOUND)
|
||||
target_link_libraries(plasma_engine_mouse ${X11_Xfixes_LIB})
|
||||
endif ()
|
||||
|
||||
+if (X11_FOUND)
|
||||
+ target_link_libraries(plasma_engine_mouse
|
||||
+ Qt5::X11Extras
|
||||
+ ${X11_LIBRARIES}
|
||||
+ )
|
||||
+endif ()
|
||||
+
|
||||
kcoreaddons_desktop_to_json(plasma_engine_mouse plasma-dataengine-mouse.desktop)
|
||||
|
||||
install(TARGETS plasma_engine_mouse DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
SUMMARY = "Support for bookmarks and the XBEL format"
|
||||
LICENSE = "GPLv2 LGPLv2.1 GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
|
||||
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde cmake-lib
|
||||
|
||||
DEPENDS += " \
|
||||
baloo \
|
||||
kdeclarative \
|
||||
plasma-framework \
|
||||
kconfig \
|
||||
kactivities \
|
||||
krunner \
|
||||
kjsembed \
|
||||
knotifyconfig \
|
||||
kdesu \
|
||||
knewstuff \
|
||||
kwallet \
|
||||
kcmutils \
|
||||
kidletime \
|
||||
kdeclarative \
|
||||
kdewebkit \
|
||||
ktextwidgets \
|
||||
kdelibs4support \
|
||||
kcrash \
|
||||
libksysguard \
|
||||
libkscreen \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb", "", d)} \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
|
||||
zlib \
|
||||
"
|
||||
|
||||
|
||||
SRCREV = "4c8d6497e28ed21bfaa461c67fa15c9a788fa955"
|
||||
KDE_BRANCH = "Plasma/5.1"
|
||||
SRC_URI += " \
|
||||
file://0001-Initial-Wayland-support.patch \
|
||||
file://0002-Do-check-for-kwin-only-in-case-X11-was-found.patch \
|
||||
file://0003-Initial-Wayland-support-II.patch \
|
||||
file://0004-Initial-Wayland-support-III.patch \
|
||||
file://0005-Initial-Wayland-support-IV.patch \
|
||||
file://0006-Initial-Wayland-support-V.patch \
|
||||
file://0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch \
|
||||
file://0008-fix-build-for-QT_NO_SESSIONMANAGER.patch \
|
||||
file://0009-Stub-down-sessionrunner-in-x11-less-environments.patch \
|
||||
file://0010-align-phonon-path.patch \
|
||||
file://0011-kglobalaccel-add-wayland-stub.patch \
|
||||
file://0012-Make-KWayland-optional.patch \
|
||||
"
|
||||
|
||||
# Notes on patches
|
||||
# 0001 stolen from http://quickgit.kde.org/?p=clones%2Fplasma-workspace%2Fpierluigifiorini%2Fwayland.git&a=shortlog&h=8ce24d3c1cc9b3fe2ced19e7dec8c24c7ddc1173
|
||||
# 0002-0006 are neccessary for x11-less wayland
|
||||
# 0007 taskmanager stub either X11 or wayland
|
||||
|
||||
# cross libs / headers
|
||||
CMAKE_HIDE_ERROR[1] = "LibKWorkspace, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
CMAKE_HIDE_ERROR[2] = "LibKWorkspace, -S${includedir}, -S${STAGING_INCDIR}"
|
||||
CMAKE_HIDE_ERROR[3] = "LibTaskManager, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
CMAKE_HIDE_ERROR[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
|
||||
|
||||
# REVISIT
|
||||
FILES_${PN} += " \
|
||||
${datadir} \
|
||||
${libdir}/libkdeinit5*.so \
|
||||
${libdir}/plugins \
|
||||
${libdir}/qml \
|
||||
"
|
||||
FILES_${PN}-dbg += " \
|
||||
${libdir}/plugins/.debug \
|
||||
${libdir}/plugins/*/.debug \
|
||||
${libdir}/plugins/*/*/.debug \
|
||||
${libdir}/qml/org/kde/*/*/.debug \
|
||||
${libdir}/qml/org/kde/*/*/*/.debug \
|
||||
"
|
||||
|
||||
FILES_${PN}-dev = " \
|
||||
${includedir} \
|
||||
${libdir}/cmake \
|
||||
${libdir}/libkworkspace5.so \
|
||||
${libdir}/libweather_ion.so \
|
||||
${libdir}/libplasma-geolocation-interface.so \
|
||||
${libdir}/libtaskmanager.so \
|
||||
"
|
||||
@@ -0,0 +1,89 @@
|
||||
SUMMARY = "Support for bookmarks and the XBEL format"
|
||||
LICENSE = "GPLv2 LGPLv2.1 GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
|
||||
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde cmake-lib
|
||||
|
||||
DEPENDS += " \
|
||||
baloo \
|
||||
kdeclarative \
|
||||
plasma-framework \
|
||||
kconfig \
|
||||
kactivities \
|
||||
krunner \
|
||||
kjsembed \
|
||||
knotifyconfig \
|
||||
kdesu \
|
||||
knewstuff \
|
||||
kwallet \
|
||||
kcmutils \
|
||||
kidletime \
|
||||
kdeclarative \
|
||||
kdewebkit \
|
||||
ktextwidgets \
|
||||
kdelibs4support \
|
||||
kcrash \
|
||||
libksysguard \
|
||||
libkscreen \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb", "", d)} \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
|
||||
zlib \
|
||||
"
|
||||
|
||||
|
||||
SRCREV = "38cf27146758738c0885810a42a0ce2b678de9ae"
|
||||
SRC_URI += " \
|
||||
file://0001-Initial-Wayland-support.patch \
|
||||
file://0002-Do-check-for-kwin-only-in-case-X11-was-found.patch \
|
||||
file://0003-Initial-Wayland-support-II.patch \
|
||||
file://0004-Initial-Wayland-support-III.patch \
|
||||
file://0005-Initial-Wayland-support-IV.patch \
|
||||
file://0006-Initial-Wayland-support-V.patch \
|
||||
file://0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch \
|
||||
file://0008-fix-build-for-QT_NO_SESSIONMANAGER.patch \
|
||||
file://0009-Stub-down-sessionrunner-in-x11-less-environments.patch \
|
||||
file://0010-align-phonon-path.patch \
|
||||
file://0011-kglobalaccel-add-wayland-stub.patch \
|
||||
file://0012-Make-KWayland-optional.patch \
|
||||
file://0013-fix-missuse-of-HAVE_X11.patch \
|
||||
file://0014-dataengines-mouse-fix-build-in-X11-less-environments.patch \
|
||||
"
|
||||
|
||||
# Notes on patches
|
||||
# 0001 stolen from http://quickgit.kde.org/?p=clones%2Fplasma-workspace%2Fpierluigifiorini%2Fwayland.git&a=shortlog&h=8ce24d3c1cc9b3fe2ced19e7dec8c24c7ddc1173
|
||||
# 0002-0006 are neccessary for x11-less wayland
|
||||
# 0007 taskmanager stub either X11 or wayland
|
||||
|
||||
# cross libs / headers
|
||||
CMAKE_HIDE_ERROR[1] = "LibKWorkspace, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
CMAKE_HIDE_ERROR[2] = "LibKWorkspace, -S${includedir}, -S${STAGING_INCDIR}"
|
||||
CMAKE_HIDE_ERROR[3] = "LibTaskManager, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
CMAKE_HIDE_ERROR[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
|
||||
|
||||
# REVISIT
|
||||
FILES_${PN} += " \
|
||||
${datadir} \
|
||||
${libdir}/libkdeinit5*.so \
|
||||
${libdir}/plugins \
|
||||
${libdir}/qml \
|
||||
"
|
||||
FILES_${PN}-dbg += " \
|
||||
${libdir}/plugins/.debug \
|
||||
${libdir}/plugins/*/.debug \
|
||||
${libdir}/plugins/*/*/.debug \
|
||||
${libdir}/qml/org/kde/*/*/.debug \
|
||||
${libdir}/qml/org/kde/*/*/*/.debug \
|
||||
"
|
||||
|
||||
FILES_${PN}-dev = " \
|
||||
${includedir} \
|
||||
${libdir}/cmake \
|
||||
${libdir}/libkworkspace5.so \
|
||||
${libdir}/libweather_ion.so \
|
||||
${libdir}/libplasma-geolocation-interface.so \
|
||||
${libdir}/libtaskmanager.so \
|
||||
"
|
||||
Reference in New Issue
Block a user