| 1 |
commit: 25a56e558e96e6c39c511221704cf4749814a2f3 |
| 2 |
Author: Moritz Schlarb <moschlar <AT> metalabs <DOT> de> |
| 3 |
AuthorDate: Mon Apr 24 06:23:36 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 26 14:04:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a56e55 |
| 7 |
|
| 8 |
net-misc/seafile-client: Fix tests and dependencies |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/615838 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/4489 |
| 12 |
|
| 13 |
...client-6.0.4-only-use-qttest-where-needed.patch | 24 ++++++++++++++++++++++ |
| 14 |
...6.0.4.ebuild => seafile-client-6.0.4-r1.ebuild} | 7 +++++-- |
| 15 |
2 files changed, 29 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch b/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..c9dfea1d2f9 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch |
| 22 |
@@ -0,0 +1,24 @@ |
| 23 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 24 |
+index 20860a6..4261fba 100644 |
| 25 |
+--- a/CMakeLists.txt |
| 26 |
++++ b/CMakeLists.txt |
| 27 |
+@@ -176,7 +176,7 @@ ELSE() |
| 28 |
+ ENDIF() |
| 29 |
+ |
| 30 |
+ SET(USE_QT_LIBRARIES |
| 31 |
+- Core Gui Widgets LinguistTools Network Test |
| 32 |
++ Core Gui Widgets LinguistTools Network |
| 33 |
+ ) |
| 34 |
+ IF (BUILD_SHIBBOLETH_SUPPORT) |
| 35 |
+ SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} ${WEBENGINE_CORE} ${WEBKIT_NAME} ${WEBKIT_WIDGETS_NAME}) |
| 36 |
+@@ -814,7 +814,9 @@ IF (BUILD_TESTING) |
| 37 |
+ SET_TARGET_PROPERTIES(${testname} PROPERTIES |
| 38 |
+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests ) |
| 39 |
+ |
| 40 |
+- QT5_USE_MODULES(${testname} ${USE_QT_LIBRARIES}) |
| 41 |
++ INCLUDE_DIRECTORIES(${Qt5Test_INCLUDE_DIRS}) |
| 42 |
++ |
| 43 |
++ QT5_USE_MODULES(${testname} ${USE_QT_LIBRARIES} Test) |
| 44 |
+ |
| 45 |
+ ADD_TEST(${testname} ${CMAKE_CURRENT_BINARY_DIR}/tests/${testname}) |
| 46 |
+ |
| 47 |
|
| 48 |
diff --git a/net-misc/seafile-client/seafile-client-6.0.4.ebuild b/net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild |
| 49 |
similarity index 86% |
| 50 |
rename from net-misc/seafile-client/seafile-client-6.0.4.ebuild |
| 51 |
rename to net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild |
| 52 |
index c4262682b99..1f1aa3a7483 100644 |
| 53 |
--- a/net-misc/seafile-client/seafile-client-6.0.4.ebuild |
| 54 |
+++ b/net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild |
| 55 |
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 56 |
LICENSE="Apache-2.0" |
| 57 |
SLOT="0" |
| 58 |
KEYWORDS="~amd64 ~x86" |
| 59 |
-IUSE="shibboleth" |
| 60 |
+IUSE="shibboleth test" |
| 61 |
|
| 62 |
RDEPEND="net-libs/libsearpc |
| 63 |
=net-libs/ccnet-${PV} |
| 64 |
@@ -28,9 +28,11 @@ RDEPEND="net-libs/libsearpc |
| 65 |
dev-qt/qtdbus:5 |
| 66 |
shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )" |
| 67 |
DEPEND="${RDEPEND} |
| 68 |
- dev-qt/linguist-tools:5" |
| 69 |
+ dev-qt/linguist-tools:5 |
| 70 |
+ test? ( dev-qt/qttest:5 )" |
| 71 |
|
| 72 |
src_prepare() { |
| 73 |
+ eapply "${FILESDIR}/${P}-only-use-qttest-when-needed.patch" |
| 74 |
cmake-utils_src_prepare |
| 75 |
if use shibboleth ; then |
| 76 |
if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then |
| 77 |
@@ -43,6 +45,7 @@ src_configure() { |
| 78 |
export QT_SELECT=qt5 |
| 79 |
local mycmakeargs=( |
| 80 |
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" |
| 81 |
+ -DBUILD_TESTING="$(usex test)" |
| 82 |
) |
| 83 |
cmake-utils_src_configure |
| 84 |
} |
Archives