commit: a824ae61a74b6331264609ed65a7e31b3d2458b1 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Jul 1 20:40:54 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Jul 1 20:40:54 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a824ae61
[kde-plasma/plasma-desktop] Unbreak pkg_configure Adds a patch in review from upstream https://git.reviewboard.kde.org/r/124215/ Package-Manager: portage-2.2.20 .../files/plasma-desktop-5.4.0-cmake-xkb.patch | 78 ++++++++++++++++++++++ .../plasma-desktop/plasma-desktop-9999.ebuild | 2 + 2 files changed, 80 insertions(+) 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 new file mode 100644 index 0000000..76b21e0 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch @@ -0,0 +1,78 @@ +diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp +index 9fd0324..094f94f 100644 +--- a/kcms/keyboard/xkb_rules.cpp ++++ b/kcms/keyboard/xkb_rules.cpp +@@ -160,29 +160,7 @@ QString Rules::getRulesName() + + QString Rules::findXkbDir() + { +- QString xkbParentDir; +- +- QString base(XLIBDIR); +- if( base.count('/') >= 3 ) { +- // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb +- QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11"; +- QDir baseDir(base + delta); +- if( baseDir.exists() ) { +- xkbParentDir = baseDir.absolutePath(); +- } +- else { +- QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree) +- if( baseDir.exists() ) { +- xkbParentDir = baseDir.absolutePath(); +- } +- } +- } +- +- if( xkbParentDir.isEmpty() ) { +- xkbParentDir = "/usr/share/X11"; +- } +- +- return xkbParentDir + "/xkb"; ++ return QStringLiteral(XKBDIR); + } + + static QString findXkbRulesFile() +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 4fc4bce..e35ae11 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -1,16 +1,9 @@ + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) + +-find_program(some_x_program NAMES iceauth xrdb xterm) +-if (NOT some_x_program) +- set(some_x_program /usr/bin/xrdb) +- message(WARNING "Warning: Could not determine X binary directory. Assuming /usr/bin.") +-endif () +-get_filename_component(proto_xbindir "${some_x_program}" PATH) +-get_filename_component(XBINDIR "${proto_xbindir}" ABSOLUTE) +-get_filename_component(xrootdir "${XBINDIR}" PATH) +-set(XLIBDIR "${xrootdir}/lib/X11") +-if (NOT EXISTS "${XLIBDIR}") +- message(FATAL_ERROR "Couldn't find X11 prefix XLIBDIR: ${XLIBDIR}") ++find_file(XKBDIR "share/X11/xkb/") ++set(XLIBDIR "${xrootdir}/share/X11") ++if (NOT EXISTS "${XKBDIR}") ++ message(FATAL_ERROR "Couldn't find XKB location: ${XKBDIR}") + endif() + set(KWIN_BIN "kwin_x11" CACHE STRING "Name of the KWin binary") + +diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake +index eda8996..d0b48b9 100644 +--- a/config-workspace.h.cmake ++++ b/config-workspace.h.cmake +@@ -140,11 +140,8 @@ + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ + #cmakedefine TIME_WITH_SYS_TIME 1 + +-/* X binaries directory */ +-#cmakedefine XBINDIR "${XBINDIR}" +- +-/* X libraries directory */ +-#cmakedefine XLIBDIR "${XLIBDIR}" ++/* xkb resources directory */ ++#cmakedefine XKBDIR "${XKBDIR}" + + /* PackageKit-Qt has been found */ + #cmakedefine PackageKitQt5_FOUND 1 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index df144d2..2c6a02b 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -122,6 +122,8 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" +PATCHES=( "${FILESDIR}/${PN}-5.4.0-cmake-xkb.patch" ) + pkg_setup() { if has_version net-im/skype && use legacy-systray && use amd64; then einfo
