zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde-plasma: update to 5.3.0

Browse Source 
* remove wayland patches for plasma-workspace
* reduce x-less hacks and blacklist more recipes plasma-world in when building x-less
* use mainline kwayland

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-04-28 19:41:36 +02:00
parent e2c9df2036
commit e1dde6ad10
56 changed files with 194 additions and 4827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/kde-plasma.bbclass
View File

@@ -1,5 +1,5 @@
inherit kde-base
PLASMA_VERSION = "5.2.2"
PLASMA_VERSION = "5.3.0"
SRC_URI = "http://download.kde.org/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"

4
recipes-kde/packagegroups/plasma-world.bb
View File

@@ -14,7 +14,7 @@ TIER_2 = " \
TIER_3 = " \
baloo \
plasma-workspace \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "plasma-workspace", "",d)} \
"
UNTIER = " \
@@ -40,7 +40,7 @@ UNTIER = " \
muon \
oxygen \
oxygen-fonts \
plasma-desktop \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "plasma-desktop", "",d)} \
plasma-nm \
plasma-workspace-wallpapers \
polkit-kde-agent-1 \

4
recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
View File

@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-plasma cmake-lib
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "7c5e26b0f445df5b7447a12b8d54bf45"
SRC_URI[sha256sum] = "3436e907e04ab8d365459252407bf4815d1c74b781937bd3067f87fca9539ba8"
SRC_URI[md5sum] = "ffa130e4015a76889c7dfac44674dc4d"
SRC_URI[sha256sum] = "6df491dcb083b2d86c18c0f1afff51c84ecc21b6705f72d852cfb8ce50c37ca9"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"

6
recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
View File

@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma cmake-lib pkgconfig
PV = "5.6.1"
SRC_URI[md5sum] = "12c57ca501117397edbda63f284dae68"
SRC_URI[sha256sum] = "83d375cef080fd9171b84c37229b8f090e69ae4d05196c7baee472f22cfccd70"
PV = "5.9.0"
SRC_URI[md5sum] = "681f81b14a6e5ea2df5e3d765de30080"
SRC_URI[sha256sum] = "5c92b9edf53de8bb4f5ce7efed9c858cb6726eefd265ac43d8178fa0fd6dec65"
DEPENDS += "libav ki18n karchive poppler"

6
recipes-kde/plasma/tier3/baloo/baloo.bb
View File

@@ -9,9 +9,9 @@ inherit kde-plasma cmake-lib
DEPENDS += "ki18n kconfig kidletime kitemmodels kinit kauth kcrash solid kio kdelibs4support kfilemetadata ktexteditor xapian-core"
PV = "5.6.1"
SRC_URI[md5sum] = "df0d96ef85bfe46bceab6fdf796300f8"
SRC_URI[sha256sum] = "c2e1b6bf3c2ad830fde63c863fa1b792272cca2986a5145b490ba63ef116eea9"
PV = "5.9.0"
SRC_URI[md5sum] = "94c020690684290296a80d192989e430"
SRC_URI[sha256sum] = "d64fa65d2d0c2f063a6bc68232a9799709082cf8e10c9473c48c496b7f35d3d8"
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"

3794
recipes-kde/plasma/tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch
View File

File diff suppressed because it is too large Load Diff

0
recipes-kde/plasma/tier3/plasma-workspace/files/0011-fix-build-for-QT_NO_SESSIONMANAGER.patch → recipes-kde/plasma/tier3/plasma-workspace/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch
View File

55
recipes-kde/plasma/tier3/plasma-workspace/files/0002-Initial-Wayland-support-II.patch
View File

@@ -1,55 +0,0 @@
From d811d01b610432c3ae6480883f01b7367254e2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 11 Dec 2014 13:54:24 +0100
Subject: [PATCH 03/12] Initial Wayland support II
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove traces on ksmserver. This is necccessary for pure wayland environments.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
libkworkspace/CMakeLists.txt | 6 ++++--
libkworkspace/kworkspace.cpp | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
index 53ce610..b7a5348 100644
--- a/libkworkspace/CMakeLists.txt
+++ b/libkworkspace/CMakeLists.txt
@@ -10,13 +10,15 @@ remove_definitions(-DQT_NO_CAST_TO_ASCII)
set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+
+if(HAVE_X11)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+endif()
set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
-
add_library(kworkspace ${kworkspace_LIB_SRCS})
add_library(PW::KWorkspace ALIAS kworkspace)
set_target_properties(kworkspace PROPERTIES
diff --git a/libkworkspace/kworkspace.cpp b/libkworkspace/kworkspace.cpp
index bad054a..ba3e284 100644
--- a/libkworkspace/kworkspace.cpp
+++ b/libkworkspace/kworkspace.cpp
@@ -28,7 +28,9 @@
#include <QDateTime>
#include <QtDBus/QtDBus>
#include <stdlib.h> // getenv()
+#if HAVE_X11
#include <ksmserver_interface.h>
+#endif
#include <QSocketNotifier>
#if HAVE_X11
--
1.8.3.1

0
recipes-kde/plasma/tier3/plasma-workspace/files/0012-align-phonon-path.patch → recipes-kde/plasma/tier3/plasma-workspace/files/0002-align-phonon-path.patch
View File

33
recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-III.patch
View File

@@ -1,33 +0,0 @@
From 69d6878240c2b5aa680efa1cd76d0e18e5c42e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 11 Dec 2014 14:01:47 +0100
Subject: [PATCH 04/12] Initial Wayland support III
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove traces on kwin. This is necccessary for pure wayland environments.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
libkworkspace/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
index b7a5348..b456deb 100644
--- a/libkworkspace/CMakeLists.txt
+++ b/libkworkspace/CMakeLists.txt
@@ -17,7 +17,9 @@ endif()
set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
-qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
+if(HAVE_X11)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
+endif()
add_library(kworkspace ${kworkspace_LIB_SRCS})
add_library(PW::KWorkspace ALIAS kworkspace)
--
1.8.3.1

0
recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-paths-in-startkde.patch → recipes-kde/plasma/tier3/plasma-workspace/files/0003-fix-paths-in-startkde.patch
View File

39
recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-IV.patch
View File

@@ -1,39 +0,0 @@
From 7e38e15ce6ed9a1b01feb243abe911287a5b0627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 11 Dec 2014 15:33:08 +0100
Subject: [PATCH 05/12] Initial Wayland support IV
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
don't link libkworkspace against Xau in x11-less environments
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
libkworkspace/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
index b456deb..95aaeb3 100644
--- a/libkworkspace/CMakeLists.txt
+++ b/libkworkspace/CMakeLists.txt
@@ -39,7 +39,6 @@ target_link_libraries(kworkspace
KF5::I18n
KF5::WindowSystem
KF5::Plasma
- Xau
)
target_include_directories(kworkspace PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/kworkspace5>" )
@@ -47,7 +46,7 @@ target_include_directories(kworkspace PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_
configure_file(config-libkworkspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkworkspace.h)
if(X11_FOUND)
- target_link_libraries(kworkspace PRIVATE Qt5::X11Extras ${X11_LIBRARIES})
+ target_link_libraries(kworkspace PRIVATE Qt5::X11Extras ${X11_LIBRARIES} Xau)
endif()
write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/LibKWorkspaceConfigVersion.cmake VERSION
--
1.8.3.1

0
recipes-kde/plasma/tier3/plasma-workspace/files/0014-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch → recipes-kde/plasma/tier3/plasma-workspace/files/0004-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch
View File

114
recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-V.patch
View File

@@ -1,114 +0,0 @@
From 1c52091870af571e2488f5ae0b94805130f24620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 16 Dec 2014 21:02:35 +0100
Subject: [PATCH 06/12] Initial Wayland support V
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Screensaver is part of ksmserver which is not build for x11 missing
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
containmentactions/contextmenu/CMakeLists.txt | 6 ++++--
containmentactions/contextmenu/menu.cpp | 5 +++++
runners/sessions/CMakeLists.txt | 6 ++++--
runners/sessions/sessionrunner.cpp | 4 ++++
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/containmentactions/contextmenu/CMakeLists.txt b/containmentactions/contextmenu/CMakeLists.txt
index d85f8c6..980da6b 100644
--- a/containmentactions/contextmenu/CMakeLists.txt
+++ b/containmentactions/contextmenu/CMakeLists.txt
@@ -11,8 +11,10 @@ set(contextmenu_SRCS
set(krunner_xml ${plasma-workspace_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
qt5_add_dbus_interface(contextmenu_SRCS ${krunner_xml} krunner_interface)
-set(screensaver_xml ${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
-qt5_add_dbus_interface(contextmenu_SRCS ${screensaver_xml} screensaver_interface)
+if(X11_FOUND)
+ set(screensaver_xml ${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
+ qt5_add_dbus_interface(contextmenu_SRCS ${screensaver_xml} screensaver_interface)
+endif()
add_library(plasma_containmentactions_contextmenu MODULE ${contextmenu_SRCS})
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index 8e0d05a..fa7f58f 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -35,7 +35,10 @@
#include "kworkspace.h"
#include "krunner_interface.h"
+
+#if HAVE_X11
#include "screensaver_interface.h"
+#endif
#ifdef Q_OS_WIN
#define _WIN32_WINNT 0x0500 // require NT 5.0 (win 2k pro)
@@ -199,12 +202,14 @@ void ContextMenu::lockScreen()
}
#ifndef Q_OS_WIN
+#if HAVE_X11
QString interface("org.freedesktop.ScreenSaver");
org::freedesktop::ScreenSaver screensaver(interface, "/ScreenSaver",
QDBusConnection::sessionBus());
if (screensaver.isValid()) {
screensaver.Lock();
}
+#endif // HAVE_X11
#else
LockWorkStation();
#endif // !Q_OS_WIN
diff --git a/runners/sessions/CMakeLists.txt b/runners/sessions/CMakeLists.txt
index 30dbe16..7c4dcc1 100644
--- a/runners/sessions/CMakeLists.txt
+++ b/runners/sessions/CMakeLists.txt
@@ -4,8 +4,10 @@ set(krunner_sessions_SRCS
sessionrunner.cpp
)
-set(screensaver_xml ${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
-qt5_add_dbus_interface(krunner_sessions_SRCS ${screensaver_xml} screensaver_interface)
+if(X11_FOUND)
+ set(screensaver_xml ${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
+ qt5_add_dbus_interface(krunner_sessions_SRCS ${screensaver_xml} screensaver_interface)
+endif()
add_library(krunner_sessions MODULE ${krunner_sessions_SRCS})
target_link_libraries(krunner_sessions Qt5::Widgets Qt5::DBus KF5::Runner KF5::I18n PW::KWorkspace)
diff --git a/runners/sessions/sessionrunner.cpp b/runners/sessions/sessionrunner.cpp
index 489e420..b408ff0 100644
--- a/runners/sessions/sessionrunner.cpp
+++ b/runners/sessions/sessionrunner.cpp
@@ -26,7 +26,9 @@
#include "kworkspace.h"
+#if HAVE_X11
#include "screensaver_interface.h"
+#endif
K_EXPORT_PLASMA_RUNNER(calculatorrunner, SessionRunner)
@@ -271,12 +273,14 @@ void SessionRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
void SessionRunner::lock()
{
+#if HAVE_X11
QString interface("org.freedesktop.ScreenSaver");
org::freedesktop::ScreenSaver screensaver(interface, "/ScreenSaver",
QDBusConnection::sessionBus());
if (screensaver.isValid()) {
screensaver.Lock();
}
+#endif
}
#include "sessionrunner.moc"
--
1.8.3.1

0
recipes-kde/plasma/tier3/plasma-workspace/files/0015-startkde-fix-path-for-start_kdeinit_wrapper.patch → recipes-kde/plasma/tier3/plasma-workspace/files/0005-startkde-fix-path-for-start_kdeinit_wrapper.patch
View File

40
recipes-kde/plasma/tier3/plasma-workspace/files/0006-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch
View File

@@ -1,40 +0,0 @@
From 12cf21754b2ea41b13930943d6065a907dbd0a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 11 Dec 2014 15:15:43 +0100
Subject: [PATCH 07/12] HACK: enable task_wayland.cpp stub for non x11 builds
to make linker happy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
libtaskmanager/CMakeLists.txt | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/libtaskmanager/CMakeLists.txt b/libtaskmanager/CMakeLists.txt
index 640f1fb..b3ce55a 100644
--- a/libtaskmanager/CMakeLists.txt
+++ b/libtaskmanager/CMakeLists.txt
@@ -31,15 +31,11 @@ set(taskmanager_LIB_SRCS
ki18n_wrap_ui(taskmanager_LIB_SRCS launcherconfig.ui launcherproperties.ui)
-if(WIN32)
- set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_win.cpp)
-endif()
-if(HAVE_X11 AND NOT WIN32)
+if(HAVE_X11)
set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp)
+else()
+ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_wayland.cpp)
endif()
-#if(HAVE_WAYLAND)
-# set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_wayland.cpp)
-#endif()
add_library(taskmanager ${taskmanager_LIB_SRCS})
add_library(PW::LibTaskManager ALIAS taskmanager)
--
1.8.3.1

89
recipes-kde/plasma/tier3/plasma-workspace/files/0007-Do-check-for-kwin-only-in-case-X11-was-found.patch
View File

@@ -1,89 +0,0 @@
From 5133618013e0806e709a123e1f3bc20c8e51afc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 11 Dec 2014 13:37:36 +0100
Subject: [PATCH 02/12] Do check for kwin only in case X11 was found
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 49 +++++++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7da3e7..7cb7522 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,8 +23,7 @@ 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)
@@ -36,6 +35,32 @@ include(WriteBasicConfigVersionFile)
include(CheckIncludeFiles)
include(FeatureSummary)
+find_package(X11)
+set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
+ URL "http://www.x.org"
+ TYPE OPTIONAL
+ PURPOSE "Required for building the X11 based workspace")
+
+if(X11_FOUND)
+ find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
+ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+ if(NOT X11_SM_FOUND)
+ message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n")
+ endif(NOT X11_SM_FOUND)
+
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
+endif()
+
+if(X11_FOUND AND XCB_XCB_FOUND)
+ set(HAVE_X11 1)
+endif()
+
+if(HAVE_X11)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
+endif()
+
+find_package(KF5WebKit)
+
find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} CONFIG)
set_package_properties(Qt5WebKitWidgets PROPERTIES
@@ -64,26 +89,6 @@ set_package_properties(dbusmenu-qt5 PROPERTIES DESCRIPTION "Support for notifica
TYPE OPTIONAL
)
-find_package(X11)
-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
- URL "http://www.x.org"
- TYPE OPTIONAL
- PURPOSE "Required for building the X11 based workspace")
-
-if(X11_FOUND)
- find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
- set_package_properties(XCB PROPERTIES TYPE REQUIRED)
- if(NOT X11_SM_FOUND)
- message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n")
- endif(NOT X11_SM_FOUND)
-
- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
-endif()
-
-if(X11_FOUND AND XCB_XCB_FOUND)
- set(HAVE_X11 1)
-endif()
-
find_package(KF5Wayland CONFIG)
set_package_properties(KF5Wayland PROPERTIES
TYPE REQUIRED
--
1.8.3.1

57
recipes-kde/plasma/tier3/plasma-workspace/files/0008-Stub-down-sessionrunner-in-x11-less-environments.patch
View File

@@ -1,57 +0,0 @@
From 723e5d63a56f83fdc341f8f290df0453d7756ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 16 Dec 2014 22:18:12 +0100
Subject: [PATCH 09/12] Stub down sessionrunner 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>
---
runners/sessions/sessionrunner.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/runners/sessions/sessionrunner.cpp b/runners/sessions/sessionrunner.cpp
index b408ff0..a92ed51 100644
--- a/runners/sessions/sessionrunner.cpp
+++ b/runners/sessions/sessionrunner.cpp
@@ -135,6 +135,7 @@ void SessionRunner::match(Plasma::RunnerContext &context)
return;
}
+#if HAVE_X11
// first compare with SESSIONS. this must *NOT* be translated (i18n)
// as it is used as an internal command trigger (e.g. via d-bus),
// not as a user supplied query. and yes, "Ugh, magic strings"
@@ -211,6 +212,7 @@ void SessionRunner::match(Plasma::RunnerContext &context)
}
context.addMatches(matches);
+#endif HAVE_X11
}
void SessionRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
@@ -242,6 +244,7 @@ void SessionRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
}
}
+#if HAVE_X11
if (!match.data().toString().isEmpty()) {
dm.lockSwitchVT(match.data().toString().toInt());
return;
@@ -269,6 +272,12 @@ void SessionRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
lock();
dm.startReserve();
+#else
+ QMessageBox::warning(
+ 0,
+ "Warning - New Session",
+ "No session support yet in non X11 environments.");
+#endif // HAVE_X11
}
void SessionRunner::lock()
--
1.8.3.1

44
recipes-kde/plasma/tier3/plasma-workspace/files/0009-dataengines-mouse-fix-build-in-X11-less-environments.patch
View File

@@ -1,44 +0,0 @@
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

70
recipes-kde/plasma/tier3/plasma-workspace/files/0010-fix-missuse-of-HAVE_X11.patch
View File

@@ -1,70 +0,0 @@
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

34
recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
View File

@@ -26,7 +26,9 @@ DEPENDS += " \
kdewebkit \
ktextwidgets \
kdelibs4support \
kxmlrpcclient \
kcrash \
networkmanager-qt \
libksysguard \
libkscreen \
kwayland \
@@ -35,36 +37,18 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "93b4b7e187035635982d3099ba2c8d79"
SRC_URI[sha256sum] = "b174136ab7e5ec7190d5ad872e7334245b2e59c2a93e5f53666d155744a90572"
SRC_URI[md5sum] = "4085a9bdd87706beeccfcc7dd09d5b85"
SRC_URI[sha256sum] = "95f5b2319ca0c63f883e5350760d234eb2ee1a57f21e612f9ac35b0ded467316"
SRC_URI += " \
file://0001-Initial-Wayland-support.patch \
file://0002-Initial-Wayland-support-II.patch \
file://0003-Initial-Wayland-support-III.patch \
file://0004-Initial-Wayland-support-IV.patch \
file://0005-Initial-Wayland-support-V.patch \
file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \
\
file://0006-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch \
\
file://0007-Do-check-for-kwin-only-in-case-X11-was-found.patch \
file://0008-Stub-down-sessionrunner-in-x11-less-environments.patch \
file://0009-dataengines-mouse-fix-build-in-X11-less-environments.patch \
file://0010-fix-missuse-of-HAVE_X11.patch \
\
file://0011-fix-build-for-QT_NO_SESSIONMANAGER.patch \
\
file://0012-align-phonon-path.patch \
file://0013-fix-paths-in-startkde.patch \
file://0014-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \
file://0015-startkde-fix-path-for-start_kdeinit_wrapper.patch \
file://0002-align-phonon-path.patch \
file://0003-fix-paths-in-startkde.patch \
file://0004-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \
file://0005-startkde-fix-path-for-start_kdeinit_wrapper.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_ALIGN_SYSROOT[1] = "LibKWorkspace, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "LibKWorkspace, -S${includedir}, -S${STAGING_INCDIR}"

5
recipes-kde/plasma/untier/breeze/breeze.bb
View File

@@ -21,13 +21,14 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "eab754e5ad4ee9f7e83bf6bbc40815c3"
SRC_URI[sha256sum] = "5b480d0fd8f277796e7a67d5ac4e255c4479909e5aa0b283e4e0aa21035e8460"
SRC_URI[md5sum] = "1fcd000caca4ba4255c2ded1857f6786"
SRC_URI[sha256sum] = "93ed542922847f6be9684aff21c627d5cab1c1e14116f24ef360ae23095fb989"
FILES_${PN} += " \
${datadir}/color-schemes \
${datadir}/icons \
${datadir}/kconf_update \
${datadir}/kservices5 \
${datadir}/kstyle \
${datadir}/QtCurve \
${datadir}/wallpapers \

4
recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
View File

@@ -21,8 +21,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "45d17f187fea978d2892472c6a52bd5e"
SRC_URI[sha256sum] = "f5038119e5e67b1b1086e46c9e03a754a3393193d5149f67f2a433e24aeca767"
SRC_URI[md5sum] = "49908719c3243cdf6a424ed9eae3dc09"
SRC_URI[sha256sum] = "c7a63778f8595e64099c9f6e8b72bf94d8d224a60d77e8f4910cbe993023278a"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

4
recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "04bf3159d967f4f52ef92c125645197c"
SRC_URI[sha256sum] = "0b171071cfccb1812a84f97646cb5370bb66de255b29039c6d2cffcc4cedd043"
SRC_URI[md5sum] = "aab58003cc7011ddfdb6d93803327fc8"
SRC_URI[sha256sum] = "8ec14b07880fdb9029e29439e83ab365cda5db3d0fec6219e00a9433569ef2e8"
SRC_URI += "file://0001-fix-for-gtk2-only-and-gtk3-only-environments.patch"

10
recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
View File

@@ -21,19 +21,21 @@ DEPENDS += " \
sonnet \
kunitconversion \
kdelibs4support \
kross \
knewstuff \
\
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "d172b2438d751f7b39ddffb47aacbfc3"
SRC_URI[sha256sum] = "f893ad77dea6b9fa08e4eeab57d47370795ae5c39826c51c9e492a4adf5dff7f"
SRC_URI[md5sum] = "f72a71c6f52ae05e0040d9f2de5bc8ae"
SRC_URI[sha256sum] = "9472cf37d0f85fd1446e8f4e73fc7d221330c03241585cc549d28c52b1460682"
SRC_URI += "file://0001-showdesktop-do-check-HAVE_X11-correctly.patch"
FILES_${PN} += " \
${datadir}/kwin \
${datadir}/kservices5 \
${datadir}/k*5 \
${datadir}/plasma \
${datadir}/icons \
\
@@ -43,6 +45,6 @@ FILES_${PN} += " \
FILES_${PN}-dbg += " \
${libdir}/plugins/.debug \
${libdir}/plugins/plasma/dataengine/.debug \
${libdir}/plugins/*/*/.debug \
${libdir}/qml/org/kde/plasma/private/*/.debug \
"

4
recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb
View File

@@ -17,8 +17,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "e1fe62c0df75e99cdd91de86709727ca"
SRC_URI[sha256sum] = "07b5cff0afb9b7f98dee727a315365625d34d39a5611f37a1c0f62ff87e33264"
SRC_URI[md5sum] = "dd2e8097fffd3eb46812810e2e28e66b"
SRC_URI[sha256sum] = "7102a2969153e9a929fdbeaa53b7aab0b4f8a981f97071f119d0d62fd80267fe"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

4
recipes-kde/plasma/untier/khotkeys/khotkeys.bb
View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "68a9500c5e58ddfa312ef49faaaa18c3"
SRC_URI[sha256sum] = "9275a2f535a63087280763ad5ebb9d9642a4da141e1fb753c3df090a740fe599"
SRC_URI[md5sum] = "7911ebdb88f415510ef480ca1faa147f"
SRC_URI[sha256sum] = "443510037bdd51b177efa273bfb34c8c3d40d293944bec420fab0b7acc3ebea5"
FILES_${PN} += " \
${datadir}/kservices5 \

9
recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
View File

@@ -34,17 +34,16 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0cf225caaea032301670a1c11240233a"
SRC_URI[sha256sum] = "74629647897a6ff7d2bae45d1d8c1c473ed2c9a65cc7877b042114e1e81bb02b"
SRC_URI[md5sum] = "69c3b7d22f80994aaa603ee7563bd63b"
SRC_URI[sha256sum] = "3cb666bc974d26e269cf07f050049b47bb523530e14ab60802ee0c1902b7f60b"
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
FILES_${PN} += " \
${datadir}/kcmusb \
${datadir}/desktop-directories \
${datadir}/kservices5 \
${datadir}/kxmlgui5 \
${datadir}/kservicetypes5 \
${datadir}/k*5 \
${datadir}/kpackage \
\
${libdir}/plugins \
"

4
recipes-kde/plasma/untier/kio-extras/kio-extras.bb
View File

@@ -42,8 +42,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "c63b83ca7df980875a8827bdb936793d"
SRC_URI[sha256sum] = "4b5127239283da14a83fd21896f99767cec7f8f7818aa19ff960c57fec7fd7a3"
SRC_URI[md5sum] = "cac226ba36f31c0f755482c73c820685"
SRC_URI[sha256sum] = "0e523e936eebc4f19a7f65ab48709055ea4ccdfda2853059a826dca61859ce58"
FILES_${PN} += " \
${datadir}/kio_bookmarks \

4
recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "e99dbc3e15f9d71982b1daaceb28bb72"
SRC_URI[sha256sum] = "7c171db6106a38788b761966264cda6a198c0e1e1daf21d2ed5bfa4384949843"
SRC_URI[md5sum] = "fdaedd50d6f1f26205df1fe08b12c56d"
SRC_URI[sha256sum] = "3255a5170279e5d74b8d0f2f2b3371aee855b92f87dd20ed742a613908a0ff4b"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

4
recipes-kde/plasma/untier/kscreen/kscreen.bb
View File

@@ -21,8 +21,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "22b7c53da83bc103d8762565216e2c95"
SRC_URI[sha256sum] = "ec60ff60c6ff268117a570bffd471d3df7aadcd97bcec0a60041846b0820e355"
SRC_URI[md5sum] = "fa55cc44387fc83bc4600a438b61d372"
SRC_URI[sha256sum] = "58c72697a0a3fbf28f605bd6c43c97e33d5b0b31be0331838ae8cffc35a638b5"
FILES_${PN} += " \
${datadir}/kcm_kscreen \

4
recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
View File

@@ -19,5 +19,5 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "81ad5f60de97b537abecff1e6c2e139d"
SRC_URI[sha256sum] = "f2baa99177f59b528205628deda962a419c9a73c66a5cc5734ca91410bbe4a14"
SRC_URI[md5sum] = "8104b22a1d2a1f9c26f19a81489bde7d"
SRC_URI[sha256sum] = "a4286a659f27169d509e141c83e1a250de3f3fc4741c68f021b05b384cb0f3b8"

4
recipes-kde/plasma/untier/ksysguard/ksysguard.bb
View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "7ab17df276ede1a2ced54c0dcdaa6127"
SRC_URI[sha256sum] = "52d4b5b653dacbcd67770376fc35b9e0155c7a9edad9634dd8a0fe0497fce26b"
SRC_URI[md5sum] = "4e0d312a32fd528cc7fb06b2e3ae1180"
SRC_URI[sha256sum] = "919f8944f870151ec657372ea186d34333da6df621b26fc195c23ed6a9d8e25f"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

39
recipes-kde/plasma/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch
View File

@@ -1,39 +0,0 @@
From ec3ac36c761195cdc9f5bc03acb0baf1c0652212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 21 Nov 2014 08:39:28 +0100
Subject: [PATCH 1/4] CMakeLists.txt: add pkg-config as fallback for Wayland
lacking cmake-files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fixes:
| -- The following REQUIRED packages have not been found:
|
| * Wayland (required version >= 1.3) , C library implementation of the Wayland protocol: a protocol for a compositor to talk to its clients , <http://wayland.freedesktop.org>
Upstream-Status: Submitted [1]
[1] https://bugs.kde.org/show_bug.cgi?id=341149
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22edaa3..93fbaef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWAYLAND
set(REQUIRED_QT_VERSION 5.3.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
+find_package(PkgConfig)
find_package(Wayland 1.3 COMPONENTS Client Server)
set_package_properties(Wayland PROPERTIES
TYPE REQUIRED
--
1.8.3.1

30
recipes-kde/plasma/untier/kwayland/files/0001-do-not-perform-runtime-tests.patch Normal file
View File

@@ -0,0 +1,30 @@
From da4f66eb232ab3b9dfc2e8c294358641d3ef1348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 28 Apr 2015 14:38:24 +0200
Subject: [PATCH] do not perform runtime tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed3d185..08c56b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,6 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
endif()
add_subdirectory(src)
add_subdirectory(autotests)
-add_subdirectory(tests)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Wayland")
--
1.9.3

19
recipes-kde/plasma/untier/kwayland/kwayland.bb
View File

@@ -4,22 +4,15 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-base cmake-lib
SRC_URI += " \
file://0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch \
file://0002-PlasmaShell-and-PlasmaSurface-interfaces.patch \
file://0003-PlasmaEffects-interface.patch \
file://0004-Server-side-interface.patch \
"
# TODO come back to mainline
SRCREV = "bc9ab6731700eabf17e1b193d13c904f68f7ebe0"
S = "${WORKDIR}/git"
PV = "5.1.90+git${SRCPV}"
inherit kde-plasma cmake-lib
DEPENDS += "wayland wayland-native"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "ab9f358c68470f41732470b90427c5e8"
SRC_URI[sha256sum] = "99598a9fd17d9e79f69646f0ac32e6d4fb0c8aa09da58c886cca22332de41dbe"
SRC_URI += "file://0001-do-not-perform-runtime-tests.patch"
CMAKE_ALIGN_SYSROOT[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Wayland, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch
View File

@@ -16,7 +16,7 @@ diff --git a/main.cpp b/main.cpp
index 44d8c49..0cb9e44 100644
--- a/main.cpp
+++ b/main.cpp
@@ -360,7 +360,13 @@ void Application::createWorkspace()
@@ -372,7 +372,13 @@ void Application::createWorkspace()
// critical startup section where x errors cause kwin to abort.
// create workspace.
@@ -27,10 +27,10 @@ index 44d8c49..0cb9e44 100644
+#else
+ false
+#endif
+ );
+ );
emit workspaceCreated();
}
void Application::createAtoms()
diff --git a/workspace.cpp b/workspace.cpp
index 7cbe81e..66c603b 100644
--- a/workspace.cpp

148
recipes-kde/plasma/untier/kwin/files/0002-Add-X11-less-support-for-pure-wayland-environments.patch
View File

@@ -1,148 +0,0 @@
From f72c60cb99105556969c06a1008c2708b9d07da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 10 Dec 2014 17:04:24 +0100
Subject: [PATCH] Add X11-less support for pure wayland environments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 82 ++++++++++++++++++++++++++++++++++------------------------
1 file changed, 48 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a3e547..288b072 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Script
UiTools
Widgets
- X11Extras
)
find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
@@ -150,35 +149,40 @@ set_package_properties(XKB PROPERTIES
find_package(X11)
set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
URL "http://www.x.org"
- TYPE REQUIRED
+ TYPE OPTIONAL
)
-# All the required XCB components
-find_package(XCB
- REQUIRED COMPONENTS
- XCB
- XFIXES
- DAMAGE
- COMPOSITE
- SHAPE
- SYNC
- RENDER
- RANDR
- KEYSYMS
- IMAGE
- SHM
- XTEST
- GLX
- OPTIONAL_COMPONENTS
- ICCCM
-)
-set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+set(HAVE_X11 ${X11_FOUND})
+
+if(HAVE_X11)
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
+ # All the required XCB components
+ find_package(XCB
+ REQUIRED COMPONENTS
+ XCB
+ XFIXES
+ DAMAGE
+ COMPOSITE
+ SHAPE
+ SYNC
+ RENDER
+ RANDR
+ KEYSYMS
+ IMAGE
+ SHM
+ XTEST
+ GLX
+ OPTIONAL_COMPONENTS
+ ICCCM
+ )
+ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
-# and the optional XCB dependencies
-if (XCB_ICCCM_VERSION VERSION_LESS "0.4")
- set(XCB_ICCCM_FOUND FALSE)
+ # and the optional XCB dependencies
+ if (XCB_ICCCM_VERSION VERSION_LESS "0.4")
+ set(XCB_ICCCM_FOUND FALSE)
+ endif()
+ add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test applications for KWin")
endif()
-add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test applications for KWin")
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -438,9 +442,12 @@ set(kwin_QT_LIBS
Qt5::DBus
Qt5::Quick
Qt5::Script
- Qt5::X11Extras
)
+if(HAVE_X11)
+ set(kwin_QT_LIBS Qt5::X11Extras)
+endif()
+
set(kwin_KDE_LIBS
KF5::ConfigCore
KF5::CoreAddons
@@ -504,10 +511,15 @@ set(kwinLibs
${kwin_OWN_LIBS}
${kwin_QT_LIBS}
${kwin_KDE_LIBS}
- ${kwin_XLIB_LIBS}
- ${kwin_XCB_LIBS}
)
+if(HAVE_X11)
+ set(kwinLibs
+ ${kwin_XLIB_LIBS}
+ ${kwin_XCB_LIBS}
+ )
+endif()
+
if(HAVE_WAYLAND)
set(kwinLibs ${kwinLibs} ${kwin_WAYLAND_LIBS})
if(KWIN_HAVE_EGL AND Wayland_Egl_FOUND)
@@ -537,12 +549,14 @@ elseif(KWIN_BUILD_OPENGLES)
set_target_properties(kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
endif()
-kf5_add_kdeinit_executable(kwin_x11 main_x11.cpp)
-target_link_libraries(kdeinit_kwin_x11 kwin)
+if(HAVE_X11)
+ kf5_add_kdeinit_executable(kwin_x11 main_x11.cpp)
+ target_link_libraries(kdeinit_kwin_x11 kwin)
-install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP )
-install(TARGETS kdeinit_kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP )
+ install(TARGETS kdeinit_kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} )
+endif()
if(HAVE_WAYLAND)
kf5_add_kdeinit_executable(kwin_wayland main_wayland.cpp)
--
1.8.3.1

4
recipes-kde/plasma/untier/kwin/kwin.bb
View File

@@ -46,8 +46,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "543fd38ecfa2bb0a8dd251a2bbbd10bf"
SRC_URI[sha256sum] = "ccf66a4b914b2ec38f834907e610b2776c617f2725bec453d7d5faf3d2b2e8c0"
SRC_URI[md5sum] = "4cce33510b72d1f4321e529fd00bf7d4"
SRC_URI[sha256sum] = "164f6cac36e12e7aac5ae1fff2c72dc616980751d877d701dd6057d9abac6fd7"
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"

4
recipes-kde/plasma/untier/kwrited/kwrited.bb
View File

@@ -15,8 +15,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "258d03d6b29cf8a58758c1b80f922e31"
SRC_URI[sha256sum] = "d03cea79e0a1701157115afffcf4ee83dadccdbabe9ab71dc4ba36afb330a1bb"
SRC_URI[md5sum] = "552215ae248a4a301403b585b933a4b5"
SRC_URI[sha256sum] = "4dd1529c602330c6f2238b344bbd6e8fff5ce5b5b986e458036165fe68b66757"
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"

179
recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch
View File

@@ -1,26 +1,28 @@
From 72341abc7360dc8b28e9f05382222a0c8f433ea7 Mon Sep 17 00:00:00 2001
From 295235f0ab69ab218f7390e98ed12d71c0a3f757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 27 Jan 2015 10:55:30 +0100
Date: Tue, 28 Apr 2015 13:43:12 +0200
Subject: [PATCH] fix configuration/build on x-less systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 11 ++++++++---
backends/CMakeLists.txt | 6 +++---
backends/qscreen/CMakeLists.txt | 17 ++++++++++++-----
src/CMakeLists.txt | 23 ++++++++++++++++-------
src/backendlauncher/CMakeLists.txt | 23 ++++++++++++++++-------
src/backendlauncher/backendloader.cpp | 13 +++++++++----
6 files changed, 64 insertions(+), 29 deletions(-)
CMakeLists.txt | 12 ++++++++----
backends/CMakeLists.txt | 6 ++++--
backends/qscreen/CMakeLists.txt | 5 ++++-
src/CMakeLists.txt | 5 ++++-
src/backendlauncher/CMakeLists.txt | 5 ++++-
src/backendlauncher/backendloader.cpp | 13 ++++++++++---
6 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a915140..9bf94e6 100644
index 7cf6a31..beb47a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,9 +15,6 @@ include(ECMGenerateHeaders)
@@ -15,15 +15,19 @@ include(ECMGenerateHeaders)
include(FeatureSummary)
include(CheckCXXCompilerFlag)
@@ -29,172 +31,129 @@ index a915140..9bf94e6 100644
-
find_package(XCB COMPONENTS XCB RANDR)
set_package_properties(XCB PROPERTIES
TYPE OPTIONAL
@@ -31,6 +28,14 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
PURPOSE "Required for building XRandR 1.2 backend"
- TYPE REQUIRED
+ TYPE OPTIONAL
PURPOSE "Required for building XRandR backends"
)
+set(REQUIRED_QT_VERSION 5.2.0)
+if (XCB_FOUND AND X11_XCB_FOUND)
+ add_definitions(-DHAVE_X11)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras)
+else()
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test)
+if (XCB_FOUND)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+ add_definitions(-DHAVE_XCB)
+endif()
+
set(KF5_VERSION ${PROJECT_VERSION}) #When we are happy with the api, we can sync with frameworks
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSCREEN
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kscreen_version.h"
diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
index ab160e0..611d63b 100644
index ff5d751..5140984 100644
--- a/backends/CMakeLists.txt
+++ b/backends/CMakeLists.txt
@@ -1,6 +1,6 @@
@@ -1,4 +1,6 @@
add_subdirectory(fake)
add_subdirectory(qscreen)
-add_subdirectory(xrandr)
-# if (XCB_FOUND AND X11_XCB_FOUND)
+if (XCB_FOUND AND X11_XCB_FOUND)
-add_subdirectory(xrandr1.1)
+if (XCB_FOUND)
+ add_subdirectory(xrandr)
add_subdirectory(xrandr1.1)
-# endif(XCB_FOUND AND X11_XCB_FOUND)
+endif(XCB_FOUND AND X11_XCB_FOUND)
+ add_subdirectory(xrandr1.1)
+endif()
diff --git a/backends/qscreen/CMakeLists.txt b/backends/qscreen/CMakeLists.txt
index 1342d4f..ab5c4fb 100644
index 1342d4f..1a07544 100644
--- a/backends/qscreen/CMakeLists.txt
+++ b/backends/qscreen/CMakeLists.txt
@@ -12,10 +12,17 @@ set(qscreen_SRCS
add_library(KSC_QScreen MODULE ${qscreen_SRCS})
@@ -14,8 +14,11 @@ add_library(KSC_QScreen MODULE ${qscreen_SRCS})
set_target_properties(KSC_QScreen PROPERTIES PREFIX "")
-target_link_libraries(KSC_QScreen Qt5::Core
- Qt5::Gui
target_link_libraries(KSC_QScreen Qt5::Core
Qt5::Gui
- Qt5::X11Extras
- KF5::Screen
-)
+if (XCB_FOUND AND X11_XCB_FOUND)
+ target_link_libraries(KSC_QScreen Qt5::Core
+ Qt5::Gui
+ Qt5::X11Extras
+ KF5::Screen
+ )
+else()
+ target_link_libraries(KSC_QScreen Qt5::Core
+ Qt5::Gui
+ KF5::Screen
+ )
+endif()
KF5::Screen
)
+if (XCB_FOUND)
+ target_link_libraries(KSC_QScreen Qt5::X11Extras)
+endif()
+
install(TARGETS KSC_QScreen DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kscreen/)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b73de5..079f28c 100644
index 3b73de5..d496140 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,13 +24,22 @@ qt5_add_dbus_interface(libkscreen_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde.KS
add_library(KF5Screen SHARED ${libkscreen_SRCS})
-target_link_libraries(KF5Screen
- PUBLIC
- Qt5::Core
- PRIVATE
- Qt5::DBus
@@ -29,9 +29,12 @@ target_link_libraries(KF5Screen
Qt5::Core
PRIVATE
Qt5::DBus
- Qt5::X11Extras
-)
+if (XCB_FOUND AND X11_XCB_FOUND)
+ target_link_libraries(KF5Screen
+ PUBLIC
+ Qt5::Core
+ PRIVATE
+ Qt5::DBus
+ Qt5::X11Extras
+ )
+else()
+ target_link_libraries(KF5Screen
+ PUBLIC
+ Qt5::Core
+ PRIVATE
+ Qt5::DBus
+ )
+endif()
)
+if (XCB_FOUND)
+ target_link_libraries(KF5Screen PRIVATE Qt5::X11Extras)
+endif()
+
set_target_properties(KF5Screen PROPERTIES
VERSION "${KSCREEN_VERSION_STRING}"
SOVERSION "${KSCREEN_SOVERSION}"
diff --git a/src/backendlauncher/CMakeLists.txt b/src/backendlauncher/CMakeLists.txt
index de73ae1..94d1f16 100644
index de73ae1..ddf631f 100644
--- a/src/backendlauncher/CMakeLists.txt
+++ b/src/backendlauncher/CMakeLists.txt
@@ -14,12 +14,21 @@ qt5_add_dbus_adaptor(backendlauncher_SRCS ${CMAKE_SOURCE_DIR}/interfaces/org.kde
add_executable(kscreen_backend_launcher ${backendlauncher_SRCS})
-target_link_libraries(kscreen_backend_launcher
- KF5Screen
- Qt5::Core
- Qt5::Gui
@@ -18,8 +18,11 @@ target_link_libraries(kscreen_backend_launcher
KF5Screen
Qt5::Core
Qt5::Gui
- Qt5::X11Extras
- Qt5::DBus
-)
+if (XCB_FOUND AND X11_XCB_FOUND)
+ target_link_libraries(kscreen_backend_launcher
+ KF5Screen
+ Qt5::Core
+ Qt5::Gui
+ Qt5::X11Extras
+ Qt5::DBus
+ )
+else()
+ target_link_libraries(kscreen_backend_launcher
+ KF5Screen
+ Qt5::Core
+ Qt5::Gui
+ Qt5::DBus
+ )
+endif()
Qt5::DBus
)
+if (XCB_FOUND)
+ target_link_libraries(kscreen_backend_launcher Qt5::X11Extras)
+endif()
+
install(TARGETS kscreen_backend_launcher DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5})
diff --git a/src/backendlauncher/backendloader.cpp b/src/backendlauncher/backendloader.cpp
index 7b90745..9278f9c 100644
index 32a4a2b..b369ac7 100644
--- a/src/backendlauncher/backendloader.cpp
+++ b/src/backendlauncher/backendloader.cpp
@@ -24,8 +24,9 @@
#include <QDBusConnectionInterface>
#include <QDir>
#include <QPluginLoader>
+#ifdef HAVE_X11
+#ifdef HAVE_XCB
#include <QX11Info>
-
+#endif
#include <QDBusConnection>
#include <QDBusInterface>
@@ -58,6 +59,7 @@ bool BackendLoader::loadBackend(const QString& backend)
@@ -60,6 +61,7 @@ bool BackendLoader::loadBackend(const QString& backend)
continue;
}
+#ifdef HAVE_X11
+#ifdef HAVE_XCB
// When on X11, skip the QScreen backend, instead use the XRandR backend,
// if not specified in KSCREEN_BACKEND
if (backend.isEmpty() &&
@@ -65,12 +67,15 @@ bool BackendLoader::loadBackend(const QString& backend)
@@ -67,12 +69,17 @@ bool BackendLoader::loadBackend(const QString& backend)
QX11Info::isPlatformX11()) {
continue;
}
-
+#endif
// When not on X11, skip the XRandR backend, and fall back to QSCreen
// if not specified in KSCREEN_BACKEND
if (backend.isEmpty() &&
- finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
- !QX11Info::isPlatformX11()) {
+ finfo.fileName().contains(QLatin1String("KSC_XRandR"))
+#ifdef HAVE_X11
+ finfo.fileName().contains(QLatin1String("KSC_XRandR"))
+#ifdef HAVE_XCB
+ && !QX11Info::isPlatformX11()
+#endif
+ ) {
+ ) {
+
continue;
}
--
1.8.3.1
1.9.3

4
recipes-kde/plasma/untier/libkscreen/libkscreen.bb
View File

@@ -13,8 +13,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0dd314fefd799c066488769717ed52f1"
SRC_URI[sha256sum] = "7ea64d6a591fa907d0569d73e2159e120341b47253d0d3ecb9f0ceb33c9aac7a"
SRC_URI[md5sum] = "13475823e0a69ec263b284e1fd65b0c3"
SRC_URI[sha256sum] = "4dd23d72d0fa54cfaa23d62c93ab0a01ad75c4d7023895b23a47c450e890afc1"
SRC_URI += " \
file://0001-fix-configuration-build-on-x-less-systems.patch \

4
recipes-kde/plasma/untier/libksysguard/libksysguard.bb
View File

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "a7e74e6d45c40cfa22da997141793968"
SRC_URI[sha256sum] = "5b554700e004e8baae4df79b4e95f10c53994e5dcd4cb2bb02cdc0c818a6415d"
SRC_URI[md5sum] = "0f05db8ce605f62657354449b79fa12c"
SRC_URI[sha256sum] = "9b083b54951e5ac3aa638cccf1a54f720566c18f30a4cc20b7a3ac5067ee6899"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"

4
recipes-kde/plasma/untier/milou/milou.bb
View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "b1a618f3887ee6b0ebe5edf5568a6261"
SRC_URI[sha256sum] = "d9fd5bc3a438affec9d4cc786a03929c7ed379d6cac22a920f1d9b0812d8e048"
SRC_URI[md5sum] = "b333e81ca010332df095286f353ede9f"
SRC_URI[sha256sum] = "5857081b91a6537d110608901b4eac4b0e8aa627f608a8b4d243f1c86fdf2d21"
FILES_${PN} += " \
${datadir}/k*5 \

5
recipes-kde/plasma/untier/muon/muon.bb
View File

@@ -27,8 +27,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "842a75bd7614fb4f8a7003f0f49046fa"
SRC_URI[sha256sum] = "289979be6c918576c1ca2abbe90fea5b7339d5ee082a65d8ce3599ee40e4005b"
SRC_URI[md5sum] = "c2d29016945ab4a87a6e9b80099b7d0e"
SRC_URI[sha256sum] = "196c63d899ac9399993e3353d630b769d965ec1d0fa884028dd70277c5b52b39"
FILES_SOLIBSDEV = "${libdir}/libmuonprivate${SOLIBSDEV}"
@@ -41,6 +41,7 @@ FILES_${PN} += " \
${datadir}/desktoptheme \
${datadir}/muonabstractnotifier \
\
${libdir}/libMuonCommon.so \
${libdir}/libMuonNotifiers.so \
${libdir}/plugins \
${libdir}/qml \

4
recipes-kde/plasma/untier/oxygen-fonts/oxygen-fonts.bb
View File

@@ -11,8 +11,8 @@ inherit kde-plasma
DEPENDS += "fontforge-native"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "76d0d925bcc0b0df7475246914e2d47d"
SRC_URI[sha256sum] = "202d78eead03dac9ffc2717dda05ebed8cf2f5b71c04a1360cff9722c4833ff7"
SRC_URI[md5sum] = "1899f95757694bf849ff0661797e09d2"
SRC_URI[sha256sum] = "9ea4aa8c5488ab069e3d16e70a26fb8f9e3be1af2c2e67080b82ac5243b23872"
EXTRA_OECMAKE += "-DOXYGEN_FONT_INSTALL_DIR=${datadir}/fonts/truetype/oxygen"

5
recipes-kde/plasma/untier/oxygen/oxygen.bb
View File

@@ -20,11 +20,12 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0caa3195658000ad8ac06e63d935ac6d"
SRC_URI[sha256sum] = "f54f2971f750dd941e9208e690f64dde91b59024c891ccfdf5abea45af0075c2"
SRC_URI[md5sum] = "e1ffcc826eb9de168b68d7f2244df510"
SRC_URI[sha256sum] = "e3d8d37e4178b00324a99a04b0a40b6c4544f913d2887727cda6047599fda528"
FILES_${PN} += " \
${datadir}/icons \
${datadir}/kservices5 \
${datadir}/kstyle \
${datadir}/plasma \
${libdir}/plugins \

4
recipes-kde/plasma/untier/plasma-desktop/files/0001-fix-path-to-fontinst.patch
View File

@@ -22,8 +22,8 @@ index f2e6014..53961fb 100644
#ifndef __CONFIG_FONTINST_H__
#define __CONFIG_FONTINST_H__
-#define KFONTINST_LIB_EXEC_DIR "@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@"
+#define KFONTINST_LIB_EXEC_DIR "@KAUTH_HELPER_INSTALL_DIR@"
-#define KFONTINST_LIB_EXEC_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}"
+#define KFONTINST_LIB_EXEC_DIR "${KAUTH_HELPER_INSTALL_DIR}"
/* Define to 1 if you have the <locale.h> header file. */
#cmakedefine HAVE_LOCALE_H 1

5
recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
View File

@@ -29,6 +29,7 @@ DEPENDS += " \
kitemmodels \
kemoticons \
baloo \
kpeople \
\
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libxcb qtx11extras", "", d)} \
"
@@ -41,8 +42,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "dc5e656b26d31bda9d0504b3df2a5b18"
SRC_URI[sha256sum] = "d44b0eb0f59d8f2fba827418202e12fb12e0aab02c6608823085574c5a68f113"
SRC_URI[md5sum] = "3f2b87f8b1d61dd06fd882a6576f4047"
SRC_URI[sha256sum] = "376112701ee3ad29d9b5701887e5e1eb79b06e5ad3a0f1cdf3792f16eed01939"
SRC_URI += "file://0001-fix-path-to-fontinst.patch"

81
recipes-kde/plasma/untier/plasma-nm/files/0001-Adapt-to-modemmanager-qt-API-changes.patch
View File

@@ -1,81 +0,0 @@
From 4d72cb7966edda33bc72c77fc2a126844fc1f134 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 31 Mar 2015 14:37:16 +0200
Subject: [PATCH] Adapt to modemmanager-qt API changes
Upstream-Status: Backport [1]
[1] http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=4d72cb7966edda33bc72c77fc2a126844fc1f134
---
libs/models/networkmodel.cpp | 16 ++++++++--------
libs/models/networkmodel.h | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libs/models/networkmodel.cpp b/libs/models/networkmodel.cpp
index 536fdce..448ac3c 100644
--- a/libs/models/networkmodel.cpp
+++ b/libs/models/networkmodel.cpp
@@ -246,10 +246,10 @@ void NetworkModel::initializeSignals(const NetworkManager::Device::Ptr& device)
if (modem->hasInterface(ModemManager::ModemDevice::ModemInterface)) {
ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
if (modemNetwork) {
- connect(modemNetwork.data(), SIGNAL(signalQualityChanged(uint)),
- SLOT(gsmNetworkSignalQualityChanged(uint)), Qt::UniqueConnection);
- connect(modemNetwork.data(), SIGNAL(accessTechnologyChanged(ModemManager::Modem::AccessTechnologies)),
- SLOT(gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies)), Qt::UniqueConnection);
+ connect(modemNetwork.data(), SIGNAL(signalQualityChanged(ModemManager::SignalQualityPair)),
+ SLOT(gsmNetworkSignalQualityChanged(ModemManager::SignalQualityPair)), Qt::UniqueConnection);
+ connect(modemNetwork.data(), SIGNAL(accessTechnologiesChanged(QFlags<MMModemAccessTechnology>)),
+ SLOT(gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology>)), Qt::UniqueConnection);
connect(modemNetwork.data(), SIGNAL(currentModesChanged()),
SLOT(gsmNetworkCurrentModesChanged()), Qt::UniqueConnection);
}
@@ -847,9 +847,9 @@ void NetworkModel::deviceStateChanged(NetworkManager::Device::State state, Netwo
}
#if WITH_MODEMMANAGER_SUPPORT
-void NetworkModel::gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology)
+void NetworkModel::gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies)
{
- Q_UNUSED(technology);
+ Q_UNUSED(accessTechnologies);
ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
if (gsmNetwork) {
Q_FOREACH (const NetworkManager::Device::Ptr & dev, NetworkManager::networkInterfaces()) {
@@ -893,7 +893,7 @@ void NetworkModel::gsmNetworkCurrentModesChanged()
}
}
-void NetworkModel::gsmNetworkSignalQualityChanged(uint signal)
+void NetworkModel::gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality)
{
ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
if (gsmNetwork) {
@@ -912,7 +912,7 @@ void NetworkModel::gsmNetworkSignalQualityChanged(uint signal)
ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
if (modemNetwork && modemNetwork->device() == gsmNetwork->device()) {
Q_FOREACH(NetworkModelItem * item, m_list.returnItems(NetworkItemsList::Device, dev->uni())) {
- item->setSignal(signal);
+ item->setSignal(signalQuality.signal);
updateItem(item);
}
}
diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h
index 3d100ec..d506960 100644
--- a/libs/models/networkmodel.h
+++ b/libs/models/networkmodel.h
@@ -94,9 +94,9 @@ private Q_SLOTS:
void deviceRemoved(const QString& device);
void deviceStateChanged(NetworkManager::Device::State state, NetworkManager::Device::State oldState, NetworkManager::Device::StateChangeReason reason);
#if WITH_MODEMMANAGER_SUPPORT
- void gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology);
+ void gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies);
void gsmNetworkCurrentModesChanged();
- void gsmNetworkSignalQualityChanged(uint signal);
+ void gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality);
#endif
void ipConfigChanged();
void ipInterfaceChanged();
--
1.9.3

5
recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
View File

@@ -40,9 +40,8 @@ DEPENDS += " \
# MobileBroadbandProviderInfo
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "296b78fb6b84f80441f6144b11a5d6a5"
SRC_URI[sha256sum] = "4def5df2fa1d5def34c9085d11dea3e08b2a7fa0994ffe61165b14b34ea26180"
SRC_URI += "file://0001-Adapt-to-modemmanager-qt-API-changes.patch"
SRC_URI[md5sum] = "7bee8712c848e467ad23856ed6b89b9e"
SRC_URI[sha256sum] = "2a7b31a0b6a69ba062fb96702dd7215b4d2a44bede93d909853a8c915b968dfe"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

4
recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb
View File

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "8c70b41f3310aabdf719d3438498a26e"
SRC_URI[sha256sum] = "97d66cce48114ff4ba2da8cc90aff4df0cd60ff51c615f357665be4a160b5c96"
SRC_URI[md5sum] = "c11a60c69784c57c03f841c03fa966c9"
SRC_URI[sha256sum] = "4ada62b8f33cf70ebf53ba3cc67177eebd8980da3f883247ea4498428823914d"
FILES_${PN} += "${datadir}/wallpapers"

4
recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb
View File

@@ -20,8 +20,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bf016c9827f8a6bb4bdafb46e26ebe82"
SRC_URI[sha256sum] = "f80021aa5ecab11ab1363fa459e30d13a425e81b28060beb8e85d757d9cb79a2"
SRC_URI[md5sum] = "5978e2a9d149a4b4beb2f5954a689147"
SRC_URI[sha256sum] = "39426953445a4cbc48c88c5346097455c941648c908b0e06474154a949192c7c"
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"

4
recipes-kde/plasma/untier/powerdevil/powerdevil.bb
View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "e699ac7bd905d404bacdfbf6257778d5"
SRC_URI[sha256sum] = "6dfb852c15c47f48da4708e9b93adc3fda077989bdde2a421dc04def6acfe71e"
SRC_URI[md5sum] = "ba3f8e0ca8e15c0a361d9100c52a992c"
SRC_URI[sha256sum] = "15b2f95f50288a3be3786d652ddca9ecccb734f7099e0bf78127a85cbf1f25df"
FILES_${PN} += " \
${datadir}/k*5 \

4
recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "8eb5551cfee71f36fdffec76d36aa5e6"
SRC_URI[sha256sum] = "79da669c38858da4595fa5a66a4d28c2f2b4170679e58b61a9278010f474eaf2"
SRC_URI[md5sum] = "1bd06777f1f0bbf212397f44d64f5c53"
SRC_URI[sha256sum] = "8cf1efef36bd021da77ab39a5ef250d42dc04bbecda3343e61b65dfa4d53a097"
FILES_${PN} += " \
${datadir}/kservices5 \

4
recipes-kde/plasma/untier/systemsettings/systemsettings.bb
View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "8bc8d24c72ad22ef7660abae217e4318"
SRC_URI[sha256sum] = "9f91cc2aac47acf194be5c5749b7267a1d368e245d9309dcf305eea6b23e4124"
SRC_URI[md5sum] = "75daff0dd6fdc89391b35a1bacba43ce"
SRC_URI[sha256sum] = "701bf4a62c55dafcd9994d9e193c0895b7d531422f674b5548a664435aaad067"
FILES_${PN} += " \
${datadir}/k*5 \