diff options
author | Eric Hameleers <alien@slackware.com> | 2015-01-09 00:06:49 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-01-09 00:06:49 +0100 |
commit | da1be5a21ba06235b67a999f696ec66e35dc17a1 (patch) | |
tree | 6df637d821a6ac0ad65f8caaf967ea2a6956a862 /kde/patch/sddm-qt5 | |
parent | b1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff) | |
download | ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.gz ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.xz |
Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0.
KDE 5_1501
==========
This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0,
Plasma 5.1.2 and Applications 14.12.0.
Note that there is still a lot of KDE 4 stuff in here, which is necessary to
support all the Applications that have not yet been ported to KDE Frameworks 5.
The Applications 15.04 (march 2015) release should offer a lot more KF5 ports.
Preliminary build procedure (not verified 100% yet):
----------------------------------------------------
- (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-*
- build all the deps using "updates.SlackBuild" script in the "deps/" directory
- note that extra-cmake-modules is required here as well as when building the
frameworks, so I just copied it from frameworks to deps.
- logoff/login to activate Qt5 profile script.
- removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and
its compilation will fail as a result
- build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde
libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k
depim extragear"
- installpkg akonadi-qt5
- build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui
ld frameworks plasma plasma-extra polkit-kde applications"
- build kdei
==============================================================================
Eric Hameleers / alien at slackware dot com / 09-jan-2015
Diffstat (limited to 'kde/patch/sddm-qt5')
-rw-r--r-- | kde/patch/sddm-qt5/sddm_auth.diff | 25 | ||||
-rw-r--r-- | kde/patch/sddm-qt5/sddm_auth.diff.gz | bin | 379 -> 0 bytes | |||
-rw-r--r-- | kde/patch/sddm-qt5/sddm_consolekit.diff | 13 | ||||
-rw-r--r-- | kde/patch/sddm-qt5/sddm_consolekit.diff.gz | bin | 294 -> 0 bytes |
4 files changed, 38 insertions, 0 deletions
diff --git a/kde/patch/sddm-qt5/sddm_auth.diff b/kde/patch/sddm-qt5/sddm_auth.diff new file mode 100644 index 0000000..f5d21cf --- /dev/null +++ b/kde/patch/sddm-qt5/sddm_auth.diff @@ -0,0 +1,25 @@ +diff -uar sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.cpp sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.cpp +--- sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.cpp 2014-08-27 16:42:23.000000000 +0200 ++++ sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.cpp 2014-09-15 12:24:06.717173942 +0200 +@@ -20,8 +20,8 @@ + + #include "PasswdBackend.h" + +-#include "auth/AuthMessages.h" +-#include "helper/HelperApp.h" ++#include "Auth.h" ++#include "../HelperApp.h" + + #include <QtCore/QDebug> + +diff -uar sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.h sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.h +--- sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.h 2014-08-27 16:42:23.000000000 +0200 ++++ sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.h 2014-09-15 12:17:43.135172278 +0200 +@@ -21,6 +21,7 @@ + #if !defined(PASSWDBACKEND_H) && !defined(USE_PAM) + #define PASSWDBACKEND_H + ++#include "AuthMessages.h" + #include "../Backend.h" + + namespace SDDM { diff --git a/kde/patch/sddm-qt5/sddm_auth.diff.gz b/kde/patch/sddm-qt5/sddm_auth.diff.gz Binary files differdeleted file mode 100644 index 28aa239..0000000 --- a/kde/patch/sddm-qt5/sddm_auth.diff.gz +++ /dev/null diff --git a/kde/patch/sddm-qt5/sddm_consolekit.diff b/kde/patch/sddm-qt5/sddm_consolekit.diff new file mode 100644 index 0000000..acdfdc1 --- /dev/null +++ b/kde/patch/sddm-qt5/sddm_consolekit.diff @@ -0,0 +1,13 @@ +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a5d270d..4b48524 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -74,7 +74,7 @@ case $session in + exec xterm -geometry 80x24-0-0 + ;; + *) +- eval exec "$session" ++ eval exec ck-launch-session "$session" + ;; + esac + exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/kde/patch/sddm-qt5/sddm_consolekit.diff.gz b/kde/patch/sddm-qt5/sddm_consolekit.diff.gz Binary files differdeleted file mode 100644 index b20fee0..0000000 --- a/kde/patch/sddm-qt5/sddm_consolekit.diff.gz +++ /dev/null |