plasma-workspace version bump and check

This commit is contained in:
groni
2015-07-02 15:37:29 +02:00
parent d3b470ec48
commit 51d79a5c04
8 changed files with 342 additions and 0 deletions
+26
View File
@@ -0,0 +1,26 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import cmaketools
def setup():
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DLIB_INSTALL_DIR=lib \
-DLIBEXEC_INSTALL_DIR=lib \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-DBUILD_TESTING=OFF")
def build():
cmaketools.make()
def install():
cmaketools.install()
pisitools.dosym("/usr/lib/drkonqi", "/usr/lib/libexec/drkonqi")
pisitools.dodoc("COPYING", "HACKING")
@@ -0,0 +1,6 @@
#%PAM-1.0
auth include system-login
account include system-login
password include system-login
session include system-login
@@ -0,0 +1,32 @@
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 91c8a3c..0c658bd 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
if [ -n "$bindir" ]; then
qbindir=`qtpaths --binaries-dir`
- qdbus=$qbindir/qdbus
+ qdbus=$qbindir/qdbus-qt5
case $PATH in
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
*) PATH=$bindir:$PATH; export PATH;;
esac
else
- qdbus=qdbus
+ qdbus=qdbus-qt5
fi
# Check if a KDE session already is running and whether it's possible to connect to X
@@ -300,9 +300,9 @@ fi
if $qdbus >/dev/null 2>/dev/null; then
: # ok
else
- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
+ echo 'startkde: Could not start D-Bus. Can you call qdbus-qt5?' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+ xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus-qt5?"
exit 1
fi
@@ -0,0 +1,29 @@
From dde9b1c1930d333d8daff25c73400e1e67f3c630 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Sun, 7 Sep 2014 22:55:24 +0200
Subject: [PATCH 3/3] Remove export of QT_PLUGIN_PATH
---
startkde/startkde.cmake | 6 ------
1 file changed, 6 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 51721d1..1d67be0 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -220,12 +220,6 @@ for prefix in `echo $scriptpath`; do
done
done
-# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-# TODO: Do we really need this?
-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
-export QT_PLUGIN_PATH
-
# Activate the kde font directories.
#
# There are 4 directories that may be used for supplying fonts for KDE.
--
2.1.0
@@ -0,0 +1,19 @@
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 0c658bd..51721d1 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -64,6 +64,14 @@ fi
mkdir -p $configDir
+kdehome=$HOME/@KDE_DEFAULT_HOME@
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+
+# see kstartupconfig source for usage
+mkdir -m 700 -p $kdehome
+mkdir -m 700 -p $kdehome/share
+mkdir -m 700 -p $kdehome/share/config
+
#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
kcminputrc Mouse cursorTheme 'breeze_cursors'
@@ -0,0 +1,6 @@
#%PAM-1.0
auth include system-login
account include system-login
password include system-login
session include system-login
@@ -0,0 +1,17 @@
--- a/lookandfeel/contents/lockscreen/LockScreen.qml
+++ b/lookandfeel/contents/lockscreen/LockScreen.qml
@@ -156,6 +156,14 @@
enabled: !authenticator.graceLocked
onAccepted: unlockFunction()
focus: true
+ //HACK: Similar hack is needed in sddm loginscreen
+ //TODO: investigate
+ Timer {
+ interval: 200
+ running: true
+ repeat: false
+ onTriggered: passwordInput.forceActiveFocus()
+ }
visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
onVisibleChanged: {
if (visible) {
+207
View File
@@ -0,0 +1,207 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>plasma-workspace</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<IsA>app:gui</IsA>
<Summary>The KDE5 Plasma Workspace Components</Summary>
<Description>The KDE5 Plasma Workspace Components</Description>
<Archive sha1sum="07f6f48fd624fbf6e4442d4cd081496aa3285bc4" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/plasma-workspace-5.3.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libkscreen-devel</Dependency>
<Dependency>libksysguard-devel</Dependency>
<Dependency>libqalculate-devel</Dependency>
<Dependency>gpsd-devel</Dependency>
<Dependency>kwayland</Dependency>
<Dependency>kf5-baloo-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>krunner-devel</Dependency>
<Dependency>kwin-devel</Dependency>
<Dependency>libXcursor-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<Dependency>xorg-util</Dependency>
<Dependency>xcb-util-keysyms-devel</Dependency>
<Dependency>xcb-util-image-devel</Dependency>
<Dependency>xcb-util-renderutil-devel</Dependency>
<Dependency>networkmanager-qt-devel</Dependency>
<Dependency>kxmlrpcclient-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>kjs-devel</Dependency>
<Dependency>pam</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXau-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>kf5-kactivities-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">lockscreen-focus.patch</Patch> -->
<!--<Patch level="1">create_kdehome.patch</Patch>
<Patch level="1">0001-Rename-qdbus-in-startkde.patch</Patch>
<Patch level="1">0003-Remove-export-of-QT_PLUGIN_PATH.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>plasma-workspace</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>+
<Dependency>qt5-tools</Dependency>
<Dependency>cln</Dependency>
<Dependency>kio</Dependency>
<Dependency>kjs</Dependency>
<Dependency>pam</Dependency>
<Dependency>zlib</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXau</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>kf5-kactivities</Dependency>
<Dependency>gpsd</Dependency>
<Dependency>libSM</Dependency>
<Dependency>libXi</Dependency>
<Dependency>libICE</Dependency>
<Dependency>kio</Dependency>
<Dependency>kjs</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>kf5-baloo</Dependency>
<Dependency>kauth</Dependency>
<Dependency>kdesu</Dependency>
<Dependency>ki18n</Dependency>
<Dependency>solid</Dependency>
<Dependency>qt5-script</Dependency>
<Dependency>qt5-phonon</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>kcrash</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kwallet</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>kpackage</Dependency>
<Dependency>kservice</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>kdewebkit</Dependency>
<Dependency>kidletime</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>kbookmarks</Dependency>
<Dependency>kguiaddons</Dependency>
<Dependency>kitemviews</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>qt5-libdbusmenu</Dependency>
<Dependency>kcompletion</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kdbusaddons</Dependency>
<Dependency>kiconthemes</Dependency>
<Dependency>kjobwidgets</Dependency>
<Dependency>kdeclarative</Dependency>
<Dependency>kglobalaccel</Dependency>
<Dependency>ktextwidgets</Dependency>
<Dependency>kwindowsystem</Dependency>
<Dependency>kxmlrpcclient</Dependency>
<Dependency>kconfigwidgets</Dependency>
<Dependency>knotifications</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>plasma-framework</Dependency>
<Dependency>kde-cli-tools</Dependency>
<Dependency>kjsembed</Dependency>
<Dependency>knewstuff</Dependency>
<Dependency>knotifyconfig</Dependency>
<Dependency>ktexteditor</Dependency>
<Dependency>kwayland</Dependency>
<Dependency>libkscreen</Dependency>
<Dependency>libksysguard</Dependency>
<Dependency>libqalculate</Dependency>
<Dependency>krunner</Dependency>
<Dependency>libksysguard</Dependency>
<Dependency>kdelibs4-support</Dependency>
<Dependency>networkmanager-qt</Dependency>
<Dependency>libXrender</Dependency>
<Dependency>xcb-util-keysyms</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/pam.d</Path>
<Path fileType="config">/etc/xdg</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="applications">/usr/share/applications</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/qt5/plugins</Path>
<Path fileType="library">/usr/lib/qt5/qml</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<Replaces>
<Package>kde-workspace</Package>
</Replaces>
<Conflicts>
<Package>kde-workspace</Package>
</Conflicts>
</Package>
<Package>
<Name>plasma-workspace-devel</Name>
<Summary>Development files for kde5 plasma-workspace</Summary>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency release="current">plasma-workspace</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/etc/pam.d/kde" permission="0644" owner="root">kde.pam</AdditionalFile>
</AdditionalFiles>
<Replaces>
<Package>kde-workspace-devel</Package>
</Replaces>
<Conflicts>
<Package>kde-workspace-devel</Package>
</Conflicts>
</Package>
<Package>
<Name>drkonqi</Name>
<Summary>KDE crash handler</Summary>
<RuntimeDependencies>
<Dependency>kdewebkit</Dependency>
<Dependency>kxmlrpcclient</Dependency>
<Dependency release="current">plasma-workspace</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/lib/libexec</Path>
<!--<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> -->
</Files>
</Package>
<History>
<Update release="2">
<Date>2015-07-02</Date>
<Version>5.3.2</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-06-12</Date>
<Version>5.3.1</Version>
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>