From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SAgRE-0000nn-UG for garchives@archives.gentoo.org; Thu, 22 Mar 2012 11:44:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 041B2E07A7; Thu, 22 Mar 2012 11:44:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B702EE07A7 for ; Thu, 22 Mar 2012 11:44:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F193664273 for ; Thu, 22 Mar 2012 11:44:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BA668E5403 for ; Thu, 22 Mar 2012 11:44:01 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1332416957.0b0410fb8b691311e324a89aff9cb647c4123969.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/ X-VCS-Repository: proj/kde X-VCS-Files: dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch dev-libs/grantlee/grantlee-0.2.0.ebuild dev-libs/grantlee/grantlee-9999.ebuild X-VCS-Directories: dev-libs/grantlee/ dev-libs/grantlee/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0b0410fb8b691311e324a89aff9cb647c4123969 X-VCS-Branch: master Date: Thu, 22 Mar 2012 11:44:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b20dd569-e700-41c2-b394-446ca042ffa7 X-Archives-Hash: 6edfd0404954e48ff156eee3eaf557a0 commit: 0b0410fb8b691311e324a89aff9cb647c4123969 Author: Johannes Huber gentoo org> AuthorDate: Thu Mar 22 11:49:17 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Mar 22 11:49:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D0b0410fb [dev-libs/grantlee] Fix build if qt-test is not installed and add missing= dep on qt-test, fixes bug 409131. (Portage version: 2.2.0_alpha93/git/Linux i686, unsigned Manifest commit) --- .../files/grantlee-0.1.9-qt-test-optional.patch | 46 ++++++++++++++= ++++++ dev-libs/grantlee/grantlee-0.2.0.ebuild | 3 + 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.patc= h b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch new file mode 100644 index 0000000..6af42cb --- /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 +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=3D409131. +--- + 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 @@ +=20 +-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) +=20 + include(${Grantlee_USE_FILE}) +=20 +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 @@ +=20 +-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) +=20 + include(${QT_USE_FILE}) +=20 +--=20 +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 3c93aef..8fc5cbb 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=3D" " DEPEND=3D"${COMMON_DEPEND} doc? ( || ( =3Dapp-doc/doxygen-1.7.6.= 1[dot] ) ) + test? ( >=3Dx11-libs/qt-test-${QT_MINIMAL}:4 ) " RDEPEND=3D"${COMMON_DEPEND}" =20 @@ -31,6 +32,8 @@ DOCS=3D(AUTHORS CHANGELOG GOALS README) # Some tests fail RESTRICT=3D"test" =20 +PATCHES=3D( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" ) + src_configure() { mycmakeargs=3D( $(cmake-utils_use_build test TESTS) diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/g= rantlee-9999.ebuild index ad22812..6f3de7d 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -23,11 +23,14 @@ COMMON_DEPEND=3D" " DEPEND=3D"${COMMON_DEPEND} doc? ( || ( =3Dapp-doc/doxygen-1.7.6.= 1[dot] ) ) + test? ( >=3Dx11-libs/qt-test-${QT_MINIMAL}:4 ) " RDEPEND=3D"${COMMON_DEPEND}" =20 DOCS=3D(AUTHORS CHANGELOG GOALS README) =20 +PATCHES=3D( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" ) + src_configure() { mycmakeargs=3D( $(cmake-utils_use_build test TESTS)