add konsole

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-05-05 16:23:57 +02:00
parent 56847928b6
commit cb2be4d28f
3 changed files with 109 additions and 0 deletions

View File

@@ -0,0 +1,53 @@
From 1cf0d1c36834d7c326c8fd1c51f9f075f0785fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 5 May 2015 15:19:52 +0200
Subject: [PATCH] fix build for qtbase build without session support
QT_NO_SESSIONMANAGER
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/Application.cpp | 7 ++++++-
src/main.cpp | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Application.cpp b/src/Application.cpp
index 0857eaf..6abaa84 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -100,7 +100,12 @@ int Application::newInstance()
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
// handle session management
- if ((args->count() != 0) || !firstInstance || !isSessionRestored()) {
+ if ((args->count() != 0) || !firstInstance
+#ifndef QT_NO_SESSIONMANAGER
+ || !isSessionRestored()) {
+#else
+ ) {
+#endif
// check for arguments to print help or other information to the
// terminal, quit if such an argument was found
if (processHelpArgs(args))
diff --git a/src/main.cpp b/src/main.cpp
index b6ba2dc..90bdbe1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -288,10 +288,12 @@ void fillAboutData(K4AboutData& aboutData)
void restoreSession(Application& app)
{
+#ifndef QT_NO_SESSIONMANAGER
if (app.isSessionRestored()) {
int n = 1;
while (KMainWindow::canBeRestored(n))
app.newMainWindow()->restore(n++);
}
+#endif
}
--
1.9.3

View File

@@ -0,0 +1,55 @@
SUMMARY = "KDE's terminal emulator"
LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2 & MIT"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING.Unicode;md5=ca09fbc4ba99ecc01ce41d513908dcd3 \
"
inherit kde-apps
DEPENDS += " \
kbookmarks \
kcompletion \
kconfig \
kconfigwidgets \
kcoreaddons \
kdoctools \
kguiaddons \
ki18n \
kiconthemes \
kinit \
kdelibs4support \
kio \
knotifications \
knotifyconfig \
kparts \
kpty \
kservice \
ktextwidgets \
kwidgetsaddons \
kwindowsystem \
kxmlgui \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "aada2f3db30dbc48d79eed86edca58c8"
SRC_URI[sha256sum] = "2c33bd94d39973db98cf35bdbcf9649bd55fdfdb20e647cdf59d9d6eacf50f83"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""
FILES_${PN} += " \
${datadir}/k*5 \
${datadir}/appdata \
${libdir}/${QT_DIR_NAME}/plugins \
${libdir}/libkdeinit5_konsole.so \
"
FILES_${PN}-dbg += " \
${libdir}/${QT_DIR_NAME}/plugins/.debug \
"

View File

@@ -10,5 +10,6 @@ RDEPENDS_${PN} = " \
kapman \
kate \
katomic \
konsole \
oxygen-icons \
"