diff options
| author | Johannes Huber <johu@gentoo.org> | 2013-08-02 01:15:23 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-08-02 01:15:23 +0200 |
| commit | 1e8b3745e75ca7343abe44447ca997e849455a9d (patch) | |
| tree | 25a4d3896c731aa2b4e92e44a0ac9538e07f9b31 /dev-libs/grantlee | |
| parent | 58bb02f487e331f08465863fcadcc4bcd13bb720 (diff) | |
| download | kde-1e8b3745e75ca7343abe44447ca997e849455a9d.tar.gz kde-1e8b3745e75ca7343abe44447ca997e849455a9d.tar.bz2 kde-1e8b3745e75ca7343abe44447ca997e849455a9d.zip | |
[dev-libs/grantlee] Remove failing patch, seems upstreamed.
Package-Manager: portage-2.2.0_alpha191
Diffstat (limited to 'dev-libs/grantlee')
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch | 46 | ||||
| -rw-r--r-- | dev-libs/grantlee/grantlee-9999.ebuild | 1 |
2 files changed, 0 insertions, 47 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 deleted file mode 100644 index 6af42cbab3f..00000000000 --- a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch +++ /dev/null @@ -1,46 +0,0 @@ -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-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index e23a5736c4e..19ff89f05a0 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -29,7 +29,6 @@ RDEPEND="${COMMON_DEPEND}" DOCS=(AUTHORS CHANGELOG GOALS README) PATCHES=( - "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" ) |