commit: f43a9f34e3d0223a96a60ac9a7506608b665ce26 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Fri Oct 3 18:01:11 2014 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 18:01:11 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f43a9f34
[kde-base/kdebase-startkde] Fix KDE failing to start wrt bug #524266. Solves regression introduced by f7f5d84c85b6c7f946b94808849648b4cb6ea667. Package-Manager: portage-2.2.12 --- .../files/kdebase-startkde-kscreen.patch | 20 ++++++++++++++++++++ .../kdebase-startkde-4.11.49.9999.ebuild | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch new file mode 100644 index 0000000..65644af --- /dev/null +++ b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch @@ -0,0 +1,20 @@ +Only try to run krandrstartup if it exists wrt bug #524266. + +After f7f5d84c85b6c7f946b94808849648b4cb6ea667, krandrstartup is no longer +available if kde-base/systemsettings is built with USE="kscreen". Otherwise, +KDE will fail to start + +Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/tree/startkde.cmake +diff --git a/startkde.cmake b/startkde.cmake +index afc2cfb..4220e64 100644 +--- a/startkde.cmake ++++ b/startkde.cmake +@@ -105,7 +105,7 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" + fi + fi + +-. krandrstartup ++KRANDRSTARTUP=`which krandrstartup 2>/dev/null` && . $KRANDRSTARTUP + + if test "$kcmfonts_general_forcefontdpi" -ne 0; then + xrdb -quiet -merge -nocpp <<EOF diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild index c0e4019..373e2dc 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild @@ -45,7 +45,10 @@ KMEXTRACTONLY=" startkde.cmake " -PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch") +PATCHES=( + "${FILESDIR}/gentoo-startkde4-4.patch" + "${FILESDIR}/${PN}-kscreen.patch" +) src_prepare() { kde4-meta_src_prepare
