| 1 |
commit: f43a9f34e3d0223a96a60ac9a7506608b665ce26 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 3 18:01:11 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 3 18:01:11 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f43a9f34 |
| 7 |
|
| 8 |
[kde-base/kdebase-startkde] Fix KDE failing to start wrt bug #524266. |
| 9 |
|
| 10 |
Solves regression introduced by f7f5d84c85b6c7f946b94808849648b4cb6ea667. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.12 |
| 13 |
|
| 14 |
--- |
| 15 |
.../files/kdebase-startkde-kscreen.patch | 20 ++++++++++++++++++++ |
| 16 |
.../kdebase-startkde-4.11.49.9999.ebuild | 5 ++++- |
| 17 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..65644af |
| 22 |
--- /dev/null |
| 23 |
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch |
| 24 |
@@ -0,0 +1,20 @@ |
| 25 |
+Only try to run krandrstartup if it exists wrt bug #524266. |
| 26 |
+ |
| 27 |
+After f7f5d84c85b6c7f946b94808849648b4cb6ea667, krandrstartup is no longer |
| 28 |
+available if kde-base/systemsettings is built with USE="kscreen". Otherwise, |
| 29 |
+KDE will fail to start |
| 30 |
+ |
| 31 |
+Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/tree/startkde.cmake |
| 32 |
+diff --git a/startkde.cmake b/startkde.cmake |
| 33 |
+index afc2cfb..4220e64 100644 |
| 34 |
+--- a/startkde.cmake |
| 35 |
++++ b/startkde.cmake |
| 36 |
+@@ -105,7 +105,7 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" |
| 37 |
+ fi |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
+-. krandrstartup |
| 41 |
++KRANDRSTARTUP=`which krandrstartup 2>/dev/null` && . $KRANDRSTARTUP |
| 42 |
+ |
| 43 |
+ if test "$kcmfonts_general_forcefontdpi" -ne 0; then |
| 44 |
+ xrdb -quiet -merge -nocpp <<EOF |
| 45 |
|
| 46 |
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 |
| 47 |
index c0e4019..373e2dc 100644 |
| 48 |
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild |
| 49 |
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild |
| 50 |
@@ -45,7 +45,10 @@ KMEXTRACTONLY=" |
| 51 |
startkde.cmake |
| 52 |
" |
| 53 |
|
| 54 |
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch") |
| 55 |
+PATCHES=( |
| 56 |
+ "${FILESDIR}/gentoo-startkde4-4.patch" |
| 57 |
+ "${FILESDIR}/${PN}-kscreen.patch" |
| 58 |
+) |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
kde4-meta_src_prepare |
Archives