diff options
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch | 46 | ||||
| -rw-r--r-- | dev-libs/grantlee/grantlee-0.2.0.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/grantlee/grantlee-9999.ebuild | 3 |
3 files changed, 52 insertions, 0 deletions
diff --git a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch new file mode 100644 index 00000000000..6af42cbab3f --- /dev/null +++ b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch @@ -0,0 +1,46 @@ +From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001 +From: Johannes Huber <johu@gentoo.org> +Date: Thu, 22 Mar 2012 11:37:57 +0100 +Subject: [PATCH] Search only for qt-test if test build option is enabled. + +Build fails on systems were no qt-test is installed and the build option +for tests is disabled. See downstream bug report +https://bugs.gentoo.org/show_bug.cgi?id=409131. +--- + templates/CMakeLists.txt | 6 +++++- + textdocument/CMakeLists.txt | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt +index 0594cc3..eec0f12 100644 +--- a/templates/CMakeLists.txt ++++ b/templates/CMakeLists.txt +@@ -1,5 +1,9 @@ + +-find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest) ++if (BUILD_TESTS) ++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest) ++else (BUILD_TESTS) ++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript) ++endif (BUILD_TESTS) + + include(${Grantlee_USE_FILE}) + +diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt +index d456663..8fa2892 100644 +--- a/textdocument/CMakeLists.txt ++++ b/textdocument/CMakeLists.txt +@@ -1,5 +1,9 @@ + +-find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest) ++if (BUILD_TESTS) ++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest) ++else (BUILD_TESTS) ++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript) ++endif (BUILD_TESTS) + + include(${QT_USE_FILE}) + +-- +1.7.9.4 + diff --git a/dev-libs/grantlee/grantlee-0.2.0.ebuild b/dev-libs/grantlee/grantlee-0.2.0.ebuild index 3c93aef9bc6..8fc5cbb2c59 100644 --- a/dev-libs/grantlee/grantlee-0.2.0.ebuild +++ b/dev-libs/grantlee/grantlee-0.2.0.ebuild @@ -23,6 +23,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) ) + test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 ) " RDEPEND="${COMMON_DEPEND}" @@ -31,6 +32,8 @@ DOCS=(AUTHORS CHANGELOG GOALS README) # Some tests fail RESTRICT="test" +PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" ) + src_configure() { mycmakeargs=( $(cmake-utils_use_build test TESTS) diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index ad228121969..6f3de7d9847 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -23,11 +23,14 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) ) + test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 ) " RDEPEND="${COMMON_DEPEND}" DOCS=(AUTHORS CHANGELOG GOALS README) +PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" ) + src_configure() { mycmakeargs=( $(cmake-utils_use_build test TESTS) |