commit: 460630fff44ed3aff2de695658b224d4fce9536d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 19:09:06 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 19:10:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=460630ff
kde-base/kdelibs: make Qt selection patch actually work
Package-Manager: portage-2.2.20.1
...4-FindQt4.patch => kdelibs-4.14.13-FindQt4.patch} | 20 ++++++++++----------
kde-base/kdelibs/kdelibs-4.9999.ebuild | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.14-FindQt4.patch
b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
similarity index 73%
rename from kde-base/kdelibs/files/kdelibs-4.14.14-FindQt4.patch
rename to kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
index 3994e20..4d413b7 100644
--- a/kde-base/kdelibs/files/kdelibs-4.14.14-FindQt4.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
@@ -12,12 +12,12 @@ Gentoo-bug: 562746
--- cmake/modules/FindQt4.cmake
+++ cmake/modules/FindQt4.cmake
-@@ -446,6 +446,23 @@ GET_FILENAME_COMPONENT(qt_install_version
"[HKEY_CURRENT_USER\\Software\\trollte
+@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version
"[HKEY_CURRENT_USER\\Software\\trollte
# check for qmake
# Debian uses qmake-qt4
# macports' Qt uses qmake-mac
+if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++ find_program(QT_QMAKE_EXECUTABLE NAMES qmake
+ PATHS
+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
+ /usr/bin
@@ -25,14 +25,14 @@ Gentoo-bug: 562746
+ DOC "The qmake executable for the Qt installation to use"
+ )
+else()
-+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
-+ PATHS
-+ ENV QTDIR
-+
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
-+ PATH_SUFFIXES bin
-+ DOC "The qmake executable for the Qt installation to use"
-+ )
-+endif()
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4
qmake-qt4 qmake-mac PATHS
+ $ENV{QTDIR}/bin
+ DOC "The qmake executable for the Qt installation to use"
+ )
++endif()
+
+ IF (QT_QMAKE_EXECUTABLE)
+
diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild
b/kde-base/kdelibs/kdelibs-4.9999.ebuild
index 4cecc61..6201109 100644
--- a/kde-base/kdelibs/kdelibs-4.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild
@@ -133,7 +133,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.1-norpath.patch"
"${FILESDIR}/${PN}-4.9.3-werror.patch"
"${FILESDIR}/${PN}-4.10.0-udisks.patch"
- "${FILESDIR}/${PN}-4.14.14-FindQt4.patch"
+ "${FILESDIR}/${PN}-4.14.13-FindQt4.patch"
)
pkg_pretend() {
