| 1 |
commit: a824ae61a74b6331264609ed65a7e31b3d2458b1 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 1 20:40:54 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 1 20:40:54 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a824ae61 |
| 7 |
|
| 8 |
[kde-plasma/plasma-desktop] Unbreak pkg_configure |
| 9 |
|
| 10 |
Adds a patch in review from upstream |
| 11 |
https://git.reviewboard.kde.org/r/124215/ |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.20 |
| 14 |
|
| 15 |
.../files/plasma-desktop-5.4.0-cmake-xkb.patch | 78 ++++++++++++++++++++++ |
| 16 |
.../plasma-desktop/plasma-desktop-9999.ebuild | 2 + |
| 17 |
2 files changed, 80 insertions(+) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..76b21e0 |
| 22 |
--- /dev/null |
| 23 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch |
| 24 |
@@ -0,0 +1,78 @@ |
| 25 |
+diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp |
| 26 |
+index 9fd0324..094f94f 100644 |
| 27 |
+--- a/kcms/keyboard/xkb_rules.cpp |
| 28 |
++++ b/kcms/keyboard/xkb_rules.cpp |
| 29 |
+@@ -160,29 +160,7 @@ QString Rules::getRulesName() |
| 30 |
+ |
| 31 |
+ QString Rules::findXkbDir() |
| 32 |
+ { |
| 33 |
+- QString xkbParentDir; |
| 34 |
+- |
| 35 |
+- QString base(XLIBDIR); |
| 36 |
+- if( base.count('/') >= 3 ) { |
| 37 |
+- // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb |
| 38 |
+- QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11"; |
| 39 |
+- QDir baseDir(base + delta); |
| 40 |
+- if( baseDir.exists() ) { |
| 41 |
+- xkbParentDir = baseDir.absolutePath(); |
| 42 |
+- } |
| 43 |
+- else { |
| 44 |
+- QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree) |
| 45 |
+- if( baseDir.exists() ) { |
| 46 |
+- xkbParentDir = baseDir.absolutePath(); |
| 47 |
+- } |
| 48 |
+- } |
| 49 |
+- } |
| 50 |
+- |
| 51 |
+- if( xkbParentDir.isEmpty() ) { |
| 52 |
+- xkbParentDir = "/usr/share/X11"; |
| 53 |
+- } |
| 54 |
+- |
| 55 |
+- return xkbParentDir + "/xkb"; |
| 56 |
++ return QStringLiteral(XKBDIR); |
| 57 |
+ } |
| 58 |
+ |
| 59 |
+ static QString findXkbRulesFile() |
| 60 |
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake |
| 61 |
+index 4fc4bce..e35ae11 100644 |
| 62 |
+--- a/ConfigureChecks.cmake |
| 63 |
++++ b/ConfigureChecks.cmake |
| 64 |
+@@ -1,16 +1,9 @@ |
| 65 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) |
| 66 |
+ |
| 67 |
+-find_program(some_x_program NAMES iceauth xrdb xterm) |
| 68 |
+-if (NOT some_x_program) |
| 69 |
+- set(some_x_program /usr/bin/xrdb) |
| 70 |
+- message(WARNING "Warning: Could not determine X binary directory. Assuming /usr/bin.") |
| 71 |
+-endif () |
| 72 |
+-get_filename_component(proto_xbindir "${some_x_program}" PATH) |
| 73 |
+-get_filename_component(XBINDIR "${proto_xbindir}" ABSOLUTE) |
| 74 |
+-get_filename_component(xrootdir "${XBINDIR}" PATH) |
| 75 |
+-set(XLIBDIR "${xrootdir}/lib/X11") |
| 76 |
+-if (NOT EXISTS "${XLIBDIR}") |
| 77 |
+- message(FATAL_ERROR "Couldn't find X11 prefix XLIBDIR: ${XLIBDIR}") |
| 78 |
++find_file(XKBDIR "share/X11/xkb/") |
| 79 |
++set(XLIBDIR "${xrootdir}/share/X11") |
| 80 |
++if (NOT EXISTS "${XKBDIR}") |
| 81 |
++ message(FATAL_ERROR "Couldn't find XKB location: ${XKBDIR}") |
| 82 |
+ endif() |
| 83 |
+ set(KWIN_BIN "kwin_x11" CACHE STRING "Name of the KWin binary") |
| 84 |
+ |
| 85 |
+diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake |
| 86 |
+index eda8996..d0b48b9 100644 |
| 87 |
+--- a/config-workspace.h.cmake |
| 88 |
++++ b/config-workspace.h.cmake |
| 89 |
+@@ -140,11 +140,8 @@ |
| 90 |
+ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ |
| 91 |
+ #cmakedefine TIME_WITH_SYS_TIME 1 |
| 92 |
+ |
| 93 |
+-/* X binaries directory */ |
| 94 |
+-#cmakedefine XBINDIR "${XBINDIR}" |
| 95 |
+- |
| 96 |
+-/* X libraries directory */ |
| 97 |
+-#cmakedefine XLIBDIR "${XLIBDIR}" |
| 98 |
++/* xkb resources directory */ |
| 99 |
++#cmakedefine XKBDIR "${XKBDIR}" |
| 100 |
+ |
| 101 |
+ /* PackageKit-Qt has been found */ |
| 102 |
+ #cmakedefine PackageKitQt5_FOUND 1 |
| 103 |
|
| 104 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 105 |
index df144d2..2c6a02b 100644 |
| 106 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 107 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 108 |
@@ -122,6 +122,8 @@ DEPEND="${COMMON_DEPEND} |
| 109 |
|
| 110 |
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
| 111 |
|
| 112 |
+PATCHES=( "${FILESDIR}/${PN}-5.4.0-cmake-xkb.patch" ) |
| 113 |
+ |
| 114 |
pkg_setup() { |
| 115 |
if has_version net-im/skype && use legacy-systray && use amd64; then |
| 116 |
einfo |
Archives