summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/kdebase-startkde')
-rw-r--r--kde-base/kdebase-startkde/ChangeLog6
-rw-r--r--kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch26
2 files changed, 31 insertions, 1 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 9116e0e650f3..060f7a0fee15 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdebase-startkde
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.235 2011/06/10 21:24:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.236 2011/06/11 06:46:53 dilfridge Exp $
+
+ 11 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/gentoo-startkde4-4.patch:
+ Add missing patch, bug 371115
10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> Manifest:
Remanifest as tarball was changed
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch
new file mode 100644
index 000000000000..4d5177507700
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch
@@ -0,0 +1,26 @@
+--- startkde.cmake.old 2011-03-24 13:07:04.919889148 +0100
++++ startkde.cmake 2011-03-24 13:14:42.033174445 +0100
+@@ -187,6 +187,11 @@
+ done
+ done
+
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/startup/"*.sh; do
++ test -r "${file}" && . "${file}"
++done
++
+ # Set the path for Qt plugins provided by KDE
+ if test -n "$QT_PLUGIN_PATH"; then
+ QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
+@@ -400,6 +405,11 @@
+ done
+ done
+
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/shutdown/"*.sh; do
++ test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION