summaryrefslogtreecommitdiffstats
path: root/kde/patch/kde-workspace
diff options
context:
space:
mode:
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
commitda1be5a21ba06235b67a999f696ec66e35dc17a1 (patch)
tree6df637d821a6ac0ad65f8caaf967ea2a6956a862 /kde/patch/kde-workspace
parentb1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff)
downloadktown-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/kde-workspace')
-rw-r--r--kde/patch/kde-workspace/kde-workspace.batteryapplet.diff13
-rw-r--r--kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gzbin301 -> 0 bytes
-rw-r--r--kde/patch/kde-workspace/kde-workspace.desktopnames.diff34
-rw-r--r--kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gzbin545 -> 0 bytes
-rw-r--r--kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff14
-rw-r--r--kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gzbin247 -> 0 bytes
6 files changed, 61 insertions, 0 deletions
diff --git a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
new file mode 100644
index 0000000..7958278
--- /dev/null
+++ b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
@@ -0,0 +1,13 @@
+diff -ur kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml
+--- kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml 2012-05-23 01:55:18.000000000 +0200
++++ kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml 2012-05-26 22:09:44.000000000 +0200
+@@ -10,7 +10,7 @@
+ <default>false</default>
+ </entry>
+ <entry name="showRemainingTime" type="Bool">
+- <default>false</default>
++ <default>true</default>
+ </entry>
+ </group>
+
+
diff --git a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
deleted file mode 100644
index 7e16f14..0000000
--- a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
+++ /dev/null
Binary files differ
diff --git a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff
new file mode 100644
index 0000000..59aef1c
--- /dev/null
+++ b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff
@@ -0,0 +1,34 @@
+commit e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
+Author: David Faure <faure@kde.org>
+Date: Fri May 2 10:26:38 2014 +0200
+
+ Fix crash when DesktopNames isn't set
+
+ BUG: 334159
+ FIXED-IN: 4.11.10
+
+diff --git a/kdm/backend/client.c b/kdm/backend/client.c
+index 335cc3e..a2d06c2 100644
+--- a/kdm/backend/client.c
++++ b/kdm/backend/client.c
+@@ -1810,12 +1810,14 @@ startClient(volatile int *pid)
+ !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
+ sessargs = "";
+ buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
+- for (buf2 = buf; *buf2; ++buf2) {
+- if (*buf2 == ';')
+- *buf2 = ':';
++ if (buf) {
++ for (buf2 = buf; *buf2; ++buf2) {
++ if (*buf2 == ';')
++ *buf2 = ':';
++ }
++ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
++ free(buf);
+ }
+- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
+- free(buf);
+ free(str);
+ free(fname);
+ goto gotit;
+
diff --git a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz
deleted file mode 100644
index add85ed..0000000
--- a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz
+++ /dev/null
Binary files differ
diff --git a/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff b/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
new file mode 100644
index 0000000..4dd9848
--- /dev/null
+++ b/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
@@ -0,0 +1,14 @@
+--- ./kdm/config.def.orig 2010-09-30 16:20:21.000000000 -0500
++++ ./kdm/config.def 2010-12-01 19:13:02.356002453 -0600
+@@ -1343,9 +1343,9 @@
+
+ Key: ServerTimeout
+ Type: int
+-Default: 30
++Default: 45
+ User: core
+-Instance: #:*/
++Instance: :*/
+ Comment:
+ How long to wait for a local &X-Server; to come up.
+ Description:
diff --git a/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz b/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz
deleted file mode 100644
index a9c2bae..0000000
--- a/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz
+++ /dev/null
Binary files differ