kde-plasma: update to 5.5.0
* add discover - a more or less muon replacement
* add kscreenlocker
* kwin
* make build for wayland-less environment
* add -DLINUX fix for imx6
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
inherit kde-base
|
||||
|
||||
PLASMA_VERSION = "5.4.3"
|
||||
PLASMA_VERSION = "5.5.0"
|
||||
|
||||
SRC_URI = "http://download.kde.org/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
|
||||
|
||||
@@ -18,6 +18,7 @@ TIER_3 = " \
|
||||
UNTIER = " \
|
||||
bluedevil \
|
||||
breeze \
|
||||
discover \
|
||||
kde-cli-tools \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "kde-gtk-config", "",d)} \
|
||||
kdeplasma-addons \
|
||||
@@ -27,6 +28,7 @@ UNTIER = " \
|
||||
kinfocenter \
|
||||
kmenuedit \
|
||||
kscreen \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "kscreenlocker", "",d)} \
|
||||
ksshaskpass \
|
||||
ksysguard \
|
||||
kwayland \
|
||||
|
||||
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
inherit kde-plasma cmake-lib
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "5a1aa0b28b3e8e870b46750898fdfd9c"
|
||||
SRC_URI[sha256sum] = "38056c388568e65976e8579825f863eccf01e730c159c81f674d3d80ebd522d5"
|
||||
SRC_URI[md5sum] = "62580c30ab98fe61c4e40a4b1abfeb68"
|
||||
SRC_URI[sha256sum] = "2a276c1423b20afb5e0d785b4208b0c0b7d3bced29d6570b39b3c5dc86b4bcf1"
|
||||
|
||||
# cross libs / headers
|
||||
CMAKE_ALIGN_SYSROOT[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
|
||||
@@ -13,7 +13,6 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
klipper/klipper.cpp | 2 ++
|
||||
klipper/main.cpp | 4 ++++
|
||||
krunner/main.cpp | 4 ++++
|
||||
ksmserver/screenlocker/greeter/main.cpp | 4 ++++
|
||||
shell/main.cpp | 5 ++++-
|
||||
5 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
@@ -90,35 +89,6 @@ index fd851c0..90c9233 100644
|
||||
|
||||
View view;
|
||||
view.setVisible(false);
|
||||
diff --git a/ksmserver/screenlocker/greeter/main.cpp b/ksmserver/screenlocker/greeter/main.cpp
|
||||
index 12e5701..a126fa7 100644
|
||||
--- a/ksmserver/screenlocker/greeter/main.cpp
|
||||
+++ b/ksmserver/screenlocker/greeter/main.cpp
|
||||
@@ -20,7 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QCommandLineParser>
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
#include <QSessionManager>
|
||||
+#endif
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -58,12 +60,14 @@ int main(int argc, char* argv[])
|
||||
QCoreApplication::setApplicationVersion(QStringLiteral("0.1"));
|
||||
QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
// disable session management for the greeter
|
||||
auto disableSessionManagement = [](QSessionManager &sm) {
|
||||
sm.setRestartHint(QSessionManager::RestartNever);
|
||||
};
|
||||
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
|
||||
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
|
||||
+#endif
|
||||
|
||||
QCommandLineParser parser;
|
||||
parser.setApplicationDescription(i18n("Greeter for the KDE Plasma Workspaces Screen locker"));
|
||||
diff --git a/shell/main.cpp b/shell/main.cpp
|
||||
index 005f908..6b5e57c 100644
|
||||
--- a/shell/main.cpp
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From ec6e2b30c1268aadad3bfd6605360d90cec3dcd1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 9 Feb 2015 15:27:21 +0100
|
||||
Subject: [PATCH] fix paths in startkde
|
||||
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>
|
||||
---
|
||||
startkde/startkde.cmake | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
||||
index 046543e..742df82 100644
|
||||
--- a/startkde/startkde.cmake
|
||||
+++ b/startkde/startkde.cmake
|
||||
@@ -113,7 +113,7 @@ EOF
|
||||
# fontconfig
|
||||
|
||||
usr_share="/usr/share"
|
||||
-install_share="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
|
||||
+install_share="@SHARE_INSTALL_PREFIX@"
|
||||
|
||||
if [ ! $install_share = $usr_share ]; then
|
||||
|
||||
@@ -128,7 +128,7 @@ if [ ! $install_share = $usr_share ]; then
|
||||
}
|
||||
|
||||
oxygenDir=$fontsDir/oxygen
|
||||
- prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen"
|
||||
+ prefixDir="@SHARE_INSTALL_PREFIX@/fonts/oxygen"
|
||||
|
||||
# if the oxygen dir doesn't exist, create a symlink to be sure that the
|
||||
# Oxygen font is available to the user
|
||||
@@ -284,7 +284,7 @@ echo 'startkde: Starting up...' 1>&2
|
||||
# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
# /usr/local.
|
||||
if test -z "$XDG_DATA_DIRS"; then
|
||||
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
+ XDG_DATA_DIRS="/usr/share:/usr/local/share"
|
||||
fi
|
||||
export XDG_DATA_DIRS
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From cf0f340a72212522c8f67c4ccfe8a118bf69a3f2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 15 Dec 2015 00:16:56 +0100
|
||||
Subject: [PATCH] startkde: remove CMAKE_INSTALL_PREFIX in XDG_DATA_DIRS
|
||||
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>
|
||||
---
|
||||
startkde/startkde.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
||||
index 12c921e..9a367b7 100644
|
||||
--- a/startkde/startkde.cmake
|
||||
+++ b/startkde/startkde.cmake
|
||||
@@ -279,7 +279,7 @@ echo 'startkde: Starting up...' 1>&2
|
||||
# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
# /usr/local.
|
||||
if test -z "$XDG_DATA_DIRS"; then
|
||||
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
+ XDG_DATA_DIRS="@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
fi
|
||||
export XDG_DATA_DIRS
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From 53a751970798108dafb01de6615559f6ca9b7d95 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 28 Aug 2015 23:43:15 +0200
|
||||
Subject: [PATCH] startplasmacompositor.cmake: align paths
|
||||
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>
|
||||
---
|
||||
startkde/startplasmacompositor.cmake | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
|
||||
index d8ed68e..5f3c153 100644
|
||||
--- a/startkde/startplasmacompositor.cmake
|
||||
+++ b/startkde/startplasmacompositor.cmake
|
||||
@@ -70,7 +70,7 @@ EOF
|
||||
# fontconfig
|
||||
|
||||
usr_share="/usr/share"
|
||||
-install_share="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
|
||||
+install_share="@SHARE_INSTALL_PREFIX@"
|
||||
|
||||
if [ ! $install_share = $usr_share ]; then
|
||||
|
||||
@@ -85,7 +85,7 @@ if [ ! $install_share = $usr_share ]; then
|
||||
}
|
||||
|
||||
oxygenDir=$fontsDir/oxygen
|
||||
- prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen"
|
||||
+ prefixDir="@SHARE_INSTALL_PREFIX@/fonts/oxygen"
|
||||
|
||||
# if the oxygen dir doesn't exist, create a symlink to be sure that the
|
||||
# Oxygen font is available to the user
|
||||
@@ -155,7 +155,7 @@ echo 'startplasmacompositor: Starting up...' 1>&2
|
||||
# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
# /usr/local.
|
||||
if test -z "$XDG_DATA_DIRS"; then
|
||||
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
+ XDG_DATA_DIRS="@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
fi
|
||||
export XDG_DATA_DIRS
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -41,19 +41,18 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "18fdce9f566050c0f2e7897b2e2df660"
|
||||
SRC_URI[sha256sum] = "bfe459234e1bcd8ed5c3a64524061330e92e38ec693099d5007048a483c71d0c"
|
||||
SRC_URI[md5sum] = "ac2d460f1e822df9da094c4e23d52bab"
|
||||
SRC_URI[sha256sum] = "2338e8b35651c5caf4fe28c99e37e89d56538f8b7c80a367e26af808f4007f04"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-QT_NO_SESSIONMANAGER.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 \
|
||||
file://0006-startkde-create-kde-s-home.patch \
|
||||
file://0007-startkde-enable-starting-X.patch \
|
||||
file://0008-startplasmacompositor.cmake-align-paths.patch \
|
||||
file://0003-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \
|
||||
file://0004-startkde-fix-path-for-start_kdeinit_wrapper.patch \
|
||||
file://0005-startkde-create-kde-s-home.patch \
|
||||
file://0006-startkde-enable-starting-X.patch \
|
||||
file://0007-startkde-remove-CMAKE_INSTALL_PREFIX-in-XDG_DATA_DIR.patch \
|
||||
"
|
||||
|
||||
# cross libs / headers
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "161e14cc39556d6755796d5cc82469fa"
|
||||
SRC_URI[sha256sum] = "7364cf95850fb30cbf487ab8e01686b82d5c7817fe45046f75bdc654a846f413"
|
||||
SRC_URI[md5sum] = "086f16601639c8fe0eec9655b1177c40"
|
||||
SRC_URI[sha256sum] = "f3e154a95845fd7cc78903808a4fdc7c4ab7a29267824654cd948a58af351140"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/bluedevilwizard \
|
||||
|
||||
@@ -2,7 +2,7 @@ SUMMARY = "Artwork, styles and assets for the Breeze visual style for the Plasma
|
||||
LICENSE = "GPLv2 & LGPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
|
||||
file://COPYING-ICONS;md5=dee28112c507e01c10d735a5c028aaaa \
|
||||
file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
|
||||
"
|
||||
|
||||
inherit kde-plasma
|
||||
@@ -22,8 +22,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "a329faa7072537e789835cc4ef922ea8"
|
||||
SRC_URI[sha256sum] = "fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa"
|
||||
SRC_URI[md5sum] = "18a2661718d8f24beb591a9f08cc3942"
|
||||
SRC_URI[sha256sum] = "77a8d5732437ccb1cec08aa1c89ab409e75aa8cd55940e49cc6ab45d72445c49"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/color-schemes \
|
||||
@@ -31,6 +31,7 @@ FILES_${PN} += " \
|
||||
${datadir}/kconf_update \
|
||||
${datadir}/kservices5 \
|
||||
${datadir}/kstyle \
|
||||
${datadir}/plasma \
|
||||
${datadir}/QtCurve \
|
||||
${datadir}/wallpapers \
|
||||
\
|
||||
|
||||
49
recipes-kde/plasma/untier/discover/discover.bb
Normal file
49
recipes-kde/plasma/untier/discover/discover.bb
Normal file
@@ -0,0 +1,49 @@
|
||||
SUMMARY = "A collection of package management tools for Debian-based systems"
|
||||
LICENSE = "GPLv3 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
|
||||
file://COPYING.GFDL;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-plasma gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtsvg \
|
||||
qtdeclarative \
|
||||
\
|
||||
qca \
|
||||
libdebconf-kde \
|
||||
libqapt \
|
||||
\
|
||||
attica \
|
||||
knewstuff \
|
||||
plasma-framework \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "992c92983197ddc4826eddfd72721e2e"
|
||||
SRC_URI[sha256sum] = "c4a19246a252b2faa4c8f1ac7436c31ceebbba71eb35d445ac784692e76bfd59"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libmuonprivate${SOLIBSDEV}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/icons \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/libdiscover \
|
||||
${datadir}/muondiscover \
|
||||
${datadir}/plasma \
|
||||
${datadir}/polkit-1 \
|
||||
\
|
||||
${libdir}/libDiscoverCommon.so \
|
||||
${libdir}/libDiscoverNotifiers.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/*/.debug \
|
||||
${OE_QMAKE_PATH_QML}/org/kde/*/.debug \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "python3"
|
||||
@@ -21,8 +21,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "023ab4d8cd49467b8fbb34b182473a88"
|
||||
SRC_URI[sha256sum] = "19e1c443e74f4472dd85fe3065fd204bebff0e3358b9f34c82c0e4b5fb74a799"
|
||||
SRC_URI[md5sum] = "43738e1cc83571da7589a2dae069e377"
|
||||
SRC_URI[sha256sum] = "9b4fadc2d7d2526f30ce22fcbcf375aefd7793aa8d53609e5ecedfc043878550"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "563127655aeae7479166e0a68811a23c"
|
||||
SRC_URI[sha256sum] = "2839198cfb470095a550cf574beb7a699fe532f77337d0a700afdccf2bdbee2a"
|
||||
SRC_URI[md5sum] = "66fbaf2f156be2afee23381ed665c1fa"
|
||||
SRC_URI[sha256sum] = "6a8454c6275668c871d6e52fa5367d1dcdb84ace5804e164b15990bd4e6e26ae"
|
||||
|
||||
SRC_URI += "file://0001-fix-for-gtk2-only-and-gtk3-only-environments.patch"
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "684bf2484d0a1445e903041fc513329d"
|
||||
SRC_URI[sha256sum] = "b7672cfea66f08d1fb8732157caf920788b3c5ace20cbe98e662a60a69e6d873"
|
||||
SRC_URI[md5sum] = "9b62a92847f08e7d1ec609b12aeb43fa"
|
||||
SRC_URI[sha256sum] = "3fd3fdbfb8b11a4552f1d9607234e6c54a3a88120875717f158d88b7ee497cf8"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kwin \
|
||||
|
||||
@@ -15,8 +15,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "c8f9e9c4779ccfad3fc9f0684a683610"
|
||||
SRC_URI[sha256sum] = "f9a143b29d862097d11ab497b8e672c9d27874e2ed92b971e4a3228e0098cb50"
|
||||
SRC_URI[md5sum] = "378c157a24cc008e47b878de6f5abb30"
|
||||
SRC_URI[sha256sum] = "0e2947636a4a8e1e4bb9b5f38eb557b62e6482b2ccb51c72027f88dc4005ccc4"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kgamma \
|
||||
|
||||
@@ -17,8 +17,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "f17065c4b8adfb52e01a60d7d891be36"
|
||||
SRC_URI[sha256sum] = "02630934f3fa5c03d384808ef2daef38a49db836fb64d384a95e54865545c64d"
|
||||
SRC_URI[md5sum] = "c12fbbcccd203624569945ef7d483bc7"
|
||||
SRC_URI[sha256sum] = "0930f4a75e7f49bd0cd39db0dbfc62f0e05571ff5023d6677546494388d23c5e"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "637fcb4975b2f0e8a475c20f59ed5b3d"
|
||||
SRC_URI[sha256sum] = "495c9ef896a550f076266099ad396f8bf4ee32b94575166acc0329696bd69624"
|
||||
SRC_URI[md5sum] = "913cbf4770c5beed41e48d028e30497e"
|
||||
SRC_URI[sha256sum] = "146a1c5ed5052a3ebff4da84f27eabf17667f5a71cb816d12ca6b21cea87eea4"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -34,8 +34,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "b6e04207418aa6b608ea6204fcb70cc6"
|
||||
SRC_URI[sha256sum] = "475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec"
|
||||
SRC_URI[md5sum] = "df05750ccea2401a3008769b79ac75e1"
|
||||
SRC_URI[sha256sum] = "7e2b4446afc53985a21f5b387692a395bf1a17f42fa75e9e77c002f138a229f7"
|
||||
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -23,8 +23,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "ac2c4e060b7217b91f15e2c853fe6e10"
|
||||
SRC_URI[sha256sum] = "36ad27922d8a21a80646d4a9bfa2b93ebc6b1cad6da6dd67799200dec1dbfc7e"
|
||||
SRC_URI[md5sum] = "260c16c02bab0d75f44559599c2b6348"
|
||||
SRC_URI[sha256sum] = "96fc1411e0db3abacc585d8a9713969f042f35a996ede575fdc4f07ba17671c1"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -21,8 +21,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "dfe6f09c37a294ac845d05d5d1f97a18"
|
||||
SRC_URI[sha256sum] = "b95ba33840e950f2c71a601f6623a9acedce5f3b58e5e1eed395eee230266a05"
|
||||
SRC_URI[md5sum] = "91d261e85aa95f22f35b01dd67433b19"
|
||||
SRC_URI[sha256sum] = "a6b3074461435b1303b669d6355c1c1a82cff4e15194b3b0dbc5fcb468baf657"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kcm_kscreen \
|
||||
|
||||
44
recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
Normal file
44
recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
Normal file
@@ -0,0 +1,44 @@
|
||||
SUMMARY = "Library and components for secure lock screen architecture"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit kde-plasma distro_features_check cmake-lib
|
||||
|
||||
DEPENDS += " \
|
||||
plasma-framework \
|
||||
kcmutils \
|
||||
kdeclarative \
|
||||
kidletime \
|
||||
kdelibs4support \
|
||||
kcrash \
|
||||
kglobalaccel \
|
||||
libxcb \
|
||||
qtx11extras \
|
||||
kwayland \
|
||||
wayland \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "29bddc4e4ab94f7e0cf5ad7b43f40bed"
|
||||
SRC_URI[sha256sum] = "c90ec7a1ec3b27c557df134a25b358c6a56cb155878bbb0870e912cca61fddd7"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/kconf_update \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/plasma \
|
||||
${datadir}/ksmserver \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
"
|
||||
|
||||
# cross libs / headers
|
||||
CMAKE_ALIGN_SYSROOT[1] = "KScreenLocker, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
CMAKE_ALIGN_SYSROOT[2] = "KScreenLocker, -S${includedir}, -S${STAGING_INCDIR}"
|
||||
@@ -19,5 +19,5 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "a2c35d3fd223d0ed120b246a7d18c029"
|
||||
SRC_URI[sha256sum] = "7eb6025e58e8cd57cab640ab42ff9670ae113317534001be94916610135127a3"
|
||||
SRC_URI[md5sum] = "ed0f72319aa3087af8d5d4f427c030c8"
|
||||
SRC_URI[sha256sum] = "10c2c4bbfdab8eb340e1a59f9378178b2c76493f512a7ff7dfceeafd3643a88a"
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "b2e2d517d2ca8036a053712cb5e39505"
|
||||
SRC_URI[sha256sum] = "935633f75ad167cbdccfee453be9b65d12015db426576d434fd47fd797daebd1"
|
||||
SRC_URI[md5sum] = "49306b8c18ffffa3db71fb8184758f36"
|
||||
SRC_URI[sha256sum] = "7b8d1e0d76ac90ff08c31cdff2ffed0235588d65baa052e840d55bc6fc0052dd"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From c469a2111eea16edb70e847b71011afd08ac4a84 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 29 Aug 2015 23:35:46 +0200
|
||||
Subject: [PATCH 2/2] fix install path
|
||||
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 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e04d6af..cbd4950 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -36,4 +36,4 @@ target_link_libraries (${library_name}
|
||||
${LIBGCRYPT_LIBRARIES}
|
||||
)
|
||||
|
||||
-install(TARGETS ${library_name} DESTINATION /${CMAKE_INSTALL_LIBDIR}/security)
|
||||
+install(TARGETS ${library_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/security)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -14,11 +14,10 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "9a70ddcbaac7d92f01a1d4e25edb2018"
|
||||
SRC_URI[sha256sum] = "a15c1fe1f8b9dc3be2600b93876bbb15cb28cf65a935c066065c516518fabe54"
|
||||
SRC_URI[md5sum] = "d2107eb680d01256fd1938a97331fc62"
|
||||
SRC_URI[sha256sum] = "0f98472e727cced732c51d3b76505adf941ac5fd5827ba66545e44006af69e20"
|
||||
SRC_URI += " \
|
||||
file://0001-use-pkgconfig-to-find-libgcrypt.patch \
|
||||
file://0002-fix-install-path.patch \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}"
|
||||
|
||||
@@ -14,8 +14,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "43b74c8a8ffac6878fc3e09b54cd2722"
|
||||
SRC_URI[sha256sum] = "17d76337e10c268823be94bb9c7b1254ea435492e9325641e34f847a76b64c81"
|
||||
SRC_URI[md5sum] = "1b6175e477ee1ccc1a218a5cb60896d9"
|
||||
SRC_URI[sha256sum] = "c4c209670b7994724a67ab79cf41d44c2e12b49c3a36600de85c7f9b90c75374"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -9,8 +9,8 @@ inherit kde-plasma cmake-lib
|
||||
DEPENDS += "wayland wayland-native"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "c6e75d3e7050ca2db6f1c8f7750a4d8f"
|
||||
SRC_URI[sha256sum] = "8085ef636c91c83c03eddaac0de7d8e7f56f08884ea8aa72fb63b9b93d7fd208"
|
||||
SRC_URI[md5sum] = "5027a8b6a6afdbe61cf2d63e8c7dbb94"
|
||||
SRC_URI[sha256sum] = "494364792100213be6d58d41497fbb20a4eaf9505e0a56dfe0d2a487671faab7"
|
||||
SRC_URI += "file://0001-do-not-perform-runtime-tests.patch"
|
||||
|
||||
CMAKE_ALIGN_SYSROOT[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
|
||||
@@ -1,24 +1,26 @@
|
||||
From 6bd24445775d64078327f50d3ea834970f4a9231 Mon Sep 17 00:00:00 2001
|
||||
From 3e8eab8c8350333d5d86fb52b3a1c89002632ecd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 28 Aug 2015 22:17:57 +0200
|
||||
Date: Fri, 11 Dec 2015 22:33:39 +0100
|
||||
Subject: [PATCH] fix build for qtbase without session management
|
||||
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>
|
||||
---
|
||||
main_x11.cpp | 2 ++
|
||||
sm.cpp | 4 ++++
|
||||
workspace.cpp | 11 ++++++++++-
|
||||
workspace.cpp | 12 ++++++++++--
|
||||
workspace.h | 2 ++
|
||||
4 files changed, 18 insertions(+), 1 deletion(-)
|
||||
4 files changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/main_x11.cpp b/main_x11.cpp
|
||||
index 5cb1f5d..162bb1b 100644
|
||||
index 2c13743..742a5af 100644
|
||||
--- a/main_x11.cpp
|
||||
+++ b/main_x11.cpp
|
||||
@@ -146,10 +146,12 @@ void ApplicationX11::performStartup()
|
||||
@@ -148,10 +148,12 @@ void ApplicationX11::performStartup()
|
||||
Application::setX11ScreenNumber(QX11Info::appScreen());
|
||||
}
|
||||
|
||||
@@ -32,7 +34,7 @@ index 5cb1f5d..162bb1b 100644
|
||||
owner.reset(new KWinSelectionOwner(Application::x11ScreenNumber()));
|
||||
connect(owner.data(), &KSelectionOwner::failedToClaimOwnership, []{
|
||||
diff --git a/sm.cpp b/sm.cpp
|
||||
index 087782d..912450f 100644
|
||||
index 6852390..efa2e82 100644
|
||||
--- a/sm.cpp
|
||||
+++ b/sm.cpp
|
||||
@@ -56,6 +56,7 @@ static KConfig *sessionConfig(QString id, QString key)
|
||||
@@ -63,7 +65,7 @@ index 087782d..912450f 100644
|
||||
|
||||
void Workspace::addSessionInfo(KConfigGroup &cg)
|
||||
diff --git a/workspace.cpp b/workspace.cpp
|
||||
index 43ec3df..efebc9d 100644
|
||||
index 078f79f..24b3219 100644
|
||||
--- a/workspace.cpp
|
||||
+++ b/workspace.cpp
|
||||
@@ -159,10 +159,12 @@ Workspace::Workspace(const QString &sessionKey)
|
||||
@@ -89,20 +91,22 @@ index 43ec3df..efebc9d 100644
|
||||
m_initialDesktop = client_info.currentDesktop();
|
||||
if (!VirtualDesktopManager::self()->setCurrent(m_initialDesktop))
|
||||
VirtualDesktopManager::self()->setCurrent(1);
|
||||
@@ -288,7 +292,9 @@ void Workspace::init()
|
||||
@@ -288,9 +292,10 @@ void Workspace::init()
|
||||
active_client = NULL;
|
||||
rootInfo->setActiveWindow(None);
|
||||
focusToNull();
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (!qApp->isSessionRestored())
|
||||
+#endif
|
||||
++block_focus; // Because it will be set below
|
||||
|
||||
-
|
||||
+#endif
|
||||
{
|
||||
@@ -353,7 +359,10 @@ void Workspace::init()
|
||||
// Begin updates blocker block
|
||||
StackingUpdatesBlocker blocker(this);
|
||||
@@ -353,7 +358,10 @@ void Workspace::init()
|
||||
} // End updates blocker block
|
||||
|
||||
Client* new_active_client = NULL;
|
||||
AbstractClient* new_active_client = nullptr;
|
||||
- if (!qApp->isSessionRestored()) {
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
+ if (!qApp->isSessionRestored())
|
||||
@@ -112,10 +116,10 @@ index 43ec3df..efebc9d 100644
|
||||
new_active_client = findClient(Predicate::WindowMatch, client_info.activeWindow());
|
||||
}
|
||||
diff --git a/workspace.h b/workspace.h
|
||||
index 0da4db7..ffd5cba 100644
|
||||
index 0653064..c3c0a02 100644
|
||||
--- a/workspace.h
|
||||
+++ b/workspace.h
|
||||
@@ -433,9 +433,11 @@ private Q_SLOTS:
|
||||
@@ -441,9 +441,11 @@ private Q_SLOTS:
|
||||
void slotDesktopCountChanged(uint previousCount, uint newCount);
|
||||
void slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop);
|
||||
|
||||
@@ -128,5 +132,5 @@ index 0da4db7..ffd5cba 100644
|
||||
Q_SIGNALS:
|
||||
/**
|
||||
--
|
||||
2.1.0
|
||||
2.5.0
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
From 670bb48076453b98c2d6ef5492fb1ea4cfbdded0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 1 Jun 2015 14:27:20 +0200
|
||||
Subject: [PATCH] add egl flags for compiling
|
||||
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 | 4 ++++
|
||||
libkwineffects/CMakeLists.txt | 3 +++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7866d2c..c678bd4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -562,6 +562,10 @@ set_target_properties(kwin PROPERTIES
|
||||
SOVERSION ${PROJECT_VERSION_MAJOR}
|
||||
)
|
||||
|
||||
+if(KWIN_HAVE_EGL)
|
||||
+ target_compile_options(kwin PUBLIC ${EGL_DEFINITIONS})
|
||||
+endif()
|
||||
+
|
||||
target_link_libraries(kwin ${kwinLibs})
|
||||
generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h)
|
||||
|
||||
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
|
||||
index 1797ed5..2d71cb8 100644
|
||||
--- a/libkwineffects/CMakeLists.txt
|
||||
+++ b/libkwineffects/CMakeLists.txt
|
||||
@@ -92,6 +92,9 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
|
||||
VERSION ${KWINEFFECTS_VERSION_STRING}
|
||||
SOVERSION ${KWINEFFECTS_SOVERSION}
|
||||
)
|
||||
+ if(KWIN_HAVE_EGL)
|
||||
+ target_compile_options(${name} PUBLIC ${EGL_DEFINITIONS})
|
||||
+ endif()
|
||||
target_link_libraries(${name} PUBLIC ${ARGN})
|
||||
|
||||
install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -6,6 +6,8 @@ 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>
|
||||
---
|
||||
eglonxbackend.cpp | 11 +++++++++--
|
||||
@@ -0,0 +1,32 @@
|
||||
From 61fe7ff07fe38dccc16d6bfc67c62432c62293e0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 14 Dec 2015 23:39:16 +0100
|
||||
Subject: [PATCH] Make building of QPA wayland plugin an option
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Pure X11 accelerator blob environments fail building for wayland
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
plugins/CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
|
||||
index bf59cac..6026948 100644
|
||||
--- a/plugins/CMakeLists.txt
|
||||
+++ b/plugins/CMakeLists.txt
|
||||
@@ -1,3 +1,7 @@
|
||||
+option(KWIN_BUILD_QPA "Enable building of KWin wayland plugin." ON)
|
||||
+
|
||||
add_subdirectory(kglobalaccel)
|
||||
+if( KWIN_BUILD_QPA )
|
||||
add_subdirectory(qpa)
|
||||
+endif()
|
||||
add_subdirectory(idletime)
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -20,10 +20,13 @@ DEPENDS += " \
|
||||
ki18n \
|
||||
kinit \
|
||||
knotifications \
|
||||
kpackage \
|
||||
kservice \
|
||||
plasma-framework \
|
||||
kwidgetsaddons \
|
||||
kwindowsystem \
|
||||
kiconthemes \
|
||||
kidletime \
|
||||
kcompletion \
|
||||
kdeclarative \
|
||||
kcmutils \
|
||||
@@ -31,6 +34,8 @@ DEPENDS += " \
|
||||
knewstuff \
|
||||
kxmlgui \
|
||||
kdecoration \
|
||||
kwayland \
|
||||
kscreenlocker \
|
||||
"
|
||||
|
||||
# this condition matches always currently - it is kept in this way as a marker
|
||||
@@ -40,21 +45,26 @@ DEPENDS += " \
|
||||
|
||||
# REVISIT: PACKAGECONFIG for optionals
|
||||
DEPENDS += " \
|
||||
kwayland \
|
||||
kactivities \
|
||||
kdoctools \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "0ec5dcf4776b7ad9a0231c04f739039d"
|
||||
SRC_URI[sha256sum] = "ab4842735dbee91e93f0d0dadb39df4aed234346010caeb3c2fcc230562ac366"
|
||||
SRC_URI[md5sum] = "613586192701ed2a0a08acc4a8d78874"
|
||||
SRC_URI[sha256sum] = "34b02f5a1ef50390ed90f550e4d15ed806279072a34e7ded2475f32027a8f338"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
file://0002-add-egl-flags-for-compiling.patch \
|
||||
file://0003-eglonxbackend-add-debug-output.patch \
|
||||
file://0002-eglonxbackend-add-debug-output.patch \
|
||||
file://0003-Make-building-of-QPA-wayland-plugin-an-option.patch \
|
||||
"
|
||||
|
||||
# pure X11 environments fail to build wayland plugin
|
||||
EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DKWIN_BUILD_QPA=ON', '-DKWIN_BUILD_QPA=OFF', d)}"
|
||||
|
||||
# kwin check libepoxy only -> egl pkgconfig is skipped
|
||||
CXXFLAGS_append_mx6 += " -DLINUX=1"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/kservices5 \
|
||||
@@ -74,7 +84,6 @@ FILES_${PN} += " \
|
||||
${libdir}/*.so \
|
||||
"
|
||||
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${libdir}/*/.debug \
|
||||
${libdir}/*/*/.debug \
|
||||
@@ -84,3 +93,5 @@ FILES_${PN}-dbg += " \
|
||||
${libdir}/*/*/*/*/*/*/.debug \
|
||||
${libdir}/*/*/*/*/*/*/*/.debug \
|
||||
"
|
||||
|
||||
REDEPENDS_${PN} += "qtmultimedia"
|
||||
|
||||
@@ -15,8 +15,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "cce33c1fc4733918fc216d577d886ac0"
|
||||
SRC_URI[sha256sum] = "d3835c5f17c3209feb9d0abee0d179cdd78881c7c0d1b3fcc05a7ff3f5863647"
|
||||
SRC_URI[md5sum] = "6e615c8ff2ae21aa59c118b34ba30d6f"
|
||||
SRC_URI[sha256sum] = "484b534875ea88637f3b2b6cfad894667a5688eb2c5f7b48728e8dd6419d1fb8"
|
||||
|
||||
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From 18833000cc646db37d9006a2766c3be0707377a8 Mon Sep 17 00:00:00 2001
|
||||
From e25d8d40b9189c0400db694b18d104909ef78fe3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 29 May 2015 23:49:00 +0200
|
||||
Date: Fri, 11 Dec 2015 22:03:01 +0100
|
||||
Subject: [PATCH] fix configuration/build on x-less systems
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@@ -14,15 +14,15 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
backends/CMakeLists.txt | 6 ++++--
|
||||
backends/qscreen/CMakeLists.txt | 5 ++++-
|
||||
src/CMakeLists.txt | 5 ++++-
|
||||
src/backendlauncher/CMakeLists.txt | 5 ++++-
|
||||
src/backendlauncher/CMakeLists.txt | 7 +++++--
|
||||
src/backendlauncher/backendloader.cpp | 11 +++++++++--
|
||||
6 files changed, 33 insertions(+), 11 deletions(-)
|
||||
6 files changed, 34 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dca5cb4..6121065 100644
|
||||
index 5b6a404..c25cdae 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -15,15 +15,19 @@ include(ECMGenerateHeaders)
|
||||
@@ -16,15 +16,19 @@ include(ECMQtDeclareLoggingCategory)
|
||||
include(FeatureSummary)
|
||||
include(CheckCXXCompilerFlag)
|
||||
|
||||
@@ -77,10 +77,10 @@ index 1342d4f..1a07544 100644
|
||||
+
|
||||
install(TARGETS KSC_QScreen DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kscreen/)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 3b73de5..d496140 100644
|
||||
index 4b56b61..6d7fab1 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -29,9 +29,12 @@ target_link_libraries(KF5Screen
|
||||
@@ -27,9 +27,12 @@ target_link_libraries(KF5Screen
|
||||
Qt5::Core
|
||||
PRIVATE
|
||||
Qt5::DBus
|
||||
@@ -95,10 +95,10 @@ index 3b73de5..d496140 100644
|
||||
VERSION "${KSCREEN_VERSION_STRING}"
|
||||
SOVERSION "${KSCREEN_SOVERSION}"
|
||||
diff --git a/src/backendlauncher/CMakeLists.txt b/src/backendlauncher/CMakeLists.txt
|
||||
index de73ae1..ddf631f 100644
|
||||
index f26ad0e..c933f10 100644
|
||||
--- a/src/backendlauncher/CMakeLists.txt
|
||||
+++ b/src/backendlauncher/CMakeLists.txt
|
||||
@@ -18,8 +18,11 @@ target_link_libraries(kscreen_backend_launcher
|
||||
@@ -26,10 +26,13 @@ target_link_libraries(kscreen_backend_launcher
|
||||
KF5Screen
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
@@ -110,12 +110,21 @@ index de73ae1..ddf631f 100644
|
||||
+ target_link_libraries(kscreen_backend_launcher Qt5::X11Extras)
|
||||
+endif()
|
||||
+
|
||||
install(TARGETS kscreen_backend_launcher DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5})
|
||||
install(TARGETS kscreen_backend_launcher
|
||||
DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}
|
||||
)
|
||||
@@ -39,4 +42,4 @@ configure_file(org.kde.kscreen.service.cmake
|
||||
)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kscreen.service
|
||||
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+)
|
||||
diff --git a/src/backendlauncher/backendloader.cpp b/src/backendlauncher/backendloader.cpp
|
||||
index 18e08bc..882d741 100644
|
||||
index 52051df..a8e53fc 100644
|
||||
--- a/src/backendlauncher/backendloader.cpp
|
||||
+++ b/src/backendlauncher/backendloader.cpp
|
||||
@@ -24,7 +24,9 @@
|
||||
@@ -27,7 +27,9 @@
|
||||
#include <QDBusConnectionInterface>
|
||||
#include <QDir>
|
||||
#include <QPluginLoader>
|
||||
@@ -125,15 +134,15 @@ index 18e08bc..882d741 100644
|
||||
|
||||
#include <memory>
|
||||
|
||||
@@ -74,6 +76,7 @@ bool BackendLoader::loadBackend(const QString& backend)
|
||||
@@ -130,6 +132,7 @@ KScreen::AbstractBackend *BackendLoader::loadBackend(const QString &name,
|
||||
continue;
|
||||
}
|
||||
|
||||
+#ifdef HAVE_XCB
|
||||
// When on X11, skip the QScreen backend, instead use the XRandR backend,
|
||||
// if not specified in KSCREEN_BACKEND
|
||||
if (backend.isEmpty() &&
|
||||
@@ -81,12 +84,16 @@ bool BackendLoader::loadBackend(const QString& backend)
|
||||
if (name.isEmpty() &&
|
||||
@@ -137,12 +140,16 @@ KScreen::AbstractBackend *BackendLoader::loadBackend(const QString &name,
|
||||
QX11Info::isPlatformX11()) {
|
||||
continue;
|
||||
}
|
||||
@@ -141,17 +150,17 @@ index 18e08bc..882d741 100644
|
||||
|
||||
// When not on X11, skip the XRandR backend, and fall back to QSCreen
|
||||
// if not specified in KSCREEN_BACKEND
|
||||
if (backend.isEmpty() &&
|
||||
if (name.isEmpty() &&
|
||||
- finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
|
||||
- !QX11Info::isPlatformX11()) {
|
||||
+ finfo.fileName().contains(QLatin1String("KSC_XRandR"))
|
||||
+#ifdef HAVE_XCB
|
||||
+ && !QX11Info::isPlatformX11()
|
||||
+#endif
|
||||
+ ) {
|
||||
+ ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
--
|
||||
1.9.3
|
||||
2.5.0
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "a9774397fcfde71a1ba186f0673eec07"
|
||||
SRC_URI[sha256sum] = "1d2b17c4e10edc4bd7ce0f220f2b68eb3522c76c2708b0ddc0c2f6bda7794975"
|
||||
SRC_URI[md5sum] = "a411e34f491faf15b62517654c48debb"
|
||||
SRC_URI[sha256sum] = "83f75c47336bf12815960010fb3e44238ef2af3ba76b72ff07a67f8599740370"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-configuration-build-on-x-less-systems.patch \
|
||||
|
||||
@@ -25,8 +25,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "4e069f7eb0789f25f537d3cfd90a3a72"
|
||||
SRC_URI[sha256sum] = "d1d858b60d83ab6acce176647a35dde98cac483f02ebdce3ca7cfd25e46cd6a1"
|
||||
SRC_URI[md5sum] = "3dfcf5648147396ca2c180ec8e427dc2"
|
||||
SRC_URI[sha256sum] = "2826e8c2f68a8c28a9100d566ac2aa5eb5b00ece664e1b35711271cb938356dc"
|
||||
|
||||
# cross libs / headers
|
||||
CMAKE_ALIGN_SYSROOT[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "d2c1570621efaa8e13b1f2079b18cadc"
|
||||
SRC_URI[sha256sum] = "e1487fc818435c25830962e0cab9b78938de4d48c332583ace87681e6080c677"
|
||||
SRC_URI[md5sum] = "ca5920b3b3070cee296975047ad25a11"
|
||||
SRC_URI[sha256sum] = "d53d33b8baf343a4f4d8ac36f01ed720ac62af620eb53c8f6c262169dc720576"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -10,7 +10,7 @@ inherit kde-plasma fontcache
|
||||
|
||||
DEPENDS += "fontforge-native"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
PV = "5.4.3"
|
||||
SRC_URI[md5sum] = "8d8ab61a65642a18a40de9f3945ce584"
|
||||
SRC_URI[sha256sum] = "a02f6580e9a53cb16694a99adbb6dbf76f17584f3e97f469a22286299507838c"
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += " \
|
||||
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "b05089c7615793f78776182ab571ca1a"
|
||||
SRC_URI[sha256sum] = "0510483df7c55afde204c1927bea3ea1f2135761d0615c44f204e127743166ab"
|
||||
SRC_URI[md5sum] = "465ecaf98aba8ae8448f0e4c8dce4788"
|
||||
SRC_URI[sha256sum] = "fdc44fb86111ca9315d9f286ec2a283ea3376836add7126f7ee0a45696a8808a"
|
||||
SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
|
||||
@@ -42,8 +42,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "f5a0f34305300e6ed5731dc02df897b6"
|
||||
SRC_URI[sha256sum] = "2499741ae87166cdd5c2056dcc6a91aed6e65b9778f2c087169f6d666e44c043"
|
||||
SRC_URI[md5sum] = "4039d29843c5a5dc71b2f2f787f634d3"
|
||||
SRC_URI[sha256sum] = "846fc39cf73cc94344f1ba68a3640e586c513879820787aa06f5c528892453c5"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libkfont*${SOLIBSDEV}"
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "4c30721fefcd4b2c691b8a90c718953e"
|
||||
SRC_URI[sha256sum] = "6a13e0cab0f6699d45e75b77556fb5a8fd87c6e42803613863c9e1ee4782054d"
|
||||
SRC_URI[md5sum] = "c6cadaf7ca6510498afdb8afec7464da"
|
||||
SRC_URI[sha256sum] = "a2e01a6f1117848959d609e97225689764e7f38d3a0365b8e57bb85c875e5982"
|
||||
SRC_URI += "file://0001-use-pkgconfig-to-find-taglib.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -40,8 +40,8 @@ DEPENDS += " \
|
||||
# MobileBroadbandProviderInfo
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "aa5e06845ee69ea3a510887b2c797451"
|
||||
SRC_URI[sha256sum] = "b9500cbd386868da566af58c6ae4b55b2a7ec95d3df3bd2258467c7d2cfc90f2"
|
||||
SRC_URI[md5sum] = "d92523a194f29d7a5c08b513e8f39b02"
|
||||
SRC_URI[sha256sum] = "a4391942d81dcb1a752ef5e7ec6e84b97c6af598dc2e6c9ad02f3c7464ae9fb2"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "4dceee9550f7e433aeb2daa2a8dfee82"
|
||||
SRC_URI[sha256sum] = "1de6e524506b00a2948c19175292dd02916e19fa9111c66a9dcefab3444bcb8b"
|
||||
SRC_URI[md5sum] = "424d4866704ec719ad81d3ff01287b13"
|
||||
SRC_URI[sha256sum] = "bf11efae144e3e00623b565aedd5f48e24aba29ec03466d4f5b561e4ff214563"
|
||||
|
||||
FILES_${PN} += "${datadir}/wallpapers"
|
||||
|
||||
@@ -20,8 +20,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "cc02b7ae8de5da3c8f73170f25f7f866"
|
||||
SRC_URI[sha256sum] = "d6a782f95916d2e82bd6de94e5f54f36102d2cf3fca91984d914bb9e5be5098c"
|
||||
SRC_URI[md5sum] = "2fbd41c9ef9a09b93db363d7123b535a"
|
||||
SRC_URI[sha256sum] = "2c386293d23bd7b6e5f11bfbd2654ebc11c223d2e7f24aae0e5910e9bf401b2a"
|
||||
|
||||
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "ececfa667b9ae32497865f7f4b4ae105"
|
||||
SRC_URI[sha256sum] = "4085e4c3c7429c72502a0b4e204753e5087df88bbac5ac1f531806a2d8eb40c8"
|
||||
SRC_URI[md5sum] = "3e1a0db7fa30f18df3520ad7af966c0d"
|
||||
SRC_URI[sha256sum] = "8ef0f17ca326b839c60cbb59d71b9c8cb94d9c040e94a620291477053ff3ea0d"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "9c6fd66fead33335494cb5e1b809cb5d"
|
||||
SRC_URI[sha256sum] = "d32cf16e254f216f3477460229d5500fd63944630d073c4eec5cde400af5f9de"
|
||||
SRC_URI[md5sum] = "da294d773685c772215e4970cbd8f39c"
|
||||
SRC_URI[sha256sum] = "605ae336798642dc267cf09d4ea96bfe9e7630fde6d8821f0ff2f7353e897df3"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -23,8 +23,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "834fb7dde71fb07e9033b61c352d5cd9"
|
||||
SRC_URI[sha256sum] = "6b8716d12eda9f27a4c26a96ea8d034d3bfff501e93ddc4e4057d3ee7229e412"
|
||||
SRC_URI[md5sum] = "4010c2df7ae4981517a36ffe785ac9ad"
|
||||
SRC_URI[sha256sum] = "21776796c35c7fea2ee899f4b7c81ff1d903eae04a23813da4e29220f047f8ab"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -12,8 +12,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "db435a43b6b4466b882d09343ac80760"
|
||||
SRC_URI[sha256sum] = "4831b9c82b826ba5fd1f392a40f2ebc15fd04e4ee02c9d1d205a3e877081ce6e"
|
||||
SRC_URI[md5sum] = "9fb009809d5c21703087c48e9c5e05d9"
|
||||
SRC_URI[sha256sum] = "491cbd4d9d611a101b808226269a503c11093101eb939f04d211e1eb784e6423"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
Reference in New Issue
Block a user