[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/, net-misc/seafile-client/files/
commit: 64051760a51032b14d3e8db826f0c9ce8d2dffd1
Author: Moritz Schlarb metalabs de>
AuthorDate: Fri May 19 22:55:49 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sat May 20 18:54:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64051760
net-misc/seafile-client: Version bump to 6.0.6
Closes: https://github.com/gentoo/gentoo/pull/4683
net-misc/seafile-client/Manifest | 1 +
...e-client-6.0.4-select-qt5.patch => seafile-client-select-qt5.patch} | 0
.../{seafile-client-6.0.4-r2.ebuild => seafile-client-6.0.4-r3.ebuild} | 2 +-
.../{seafile-client-6.0.4-r2.ebuild => seafile-client-6.0.6.ebuild}| 3 +--
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index f2a952fd4d4..2c23a17f80d 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1 +1,2 @@
DIST seafile-client-6.0.4.tar.gz 2173354 SHA256
530c9f12176b69117f319fb3cfd5d2624825df20a44ea6760530a47bf60ba535 SHA512
2572750d3b5bf7444b4c4ec300b1b54ba7eafec2393b8b6d6923eb5c16d1b96f411891d072aac23b1c4bb9e1834a263bd11283216759a34c3456bf3533967552
WHIRLPOOL
89614f915c7b65877282288c6ecd97b555262335261c8c7b45f8e64c628533848a5fb9c76a36fad1f7571388ca01abca242b71f3a873d4ed5cd9528d63628101
+DIST seafile-client-6.0.6.tar.gz 2183317 SHA256
df3a587c5e93c4f53768b0724115889be2bead65d7910a31e637c3075690ea6b SHA512
a7e389ac90ea07dade2a596c3c7ef41b5037ccffafb379d0af606a1fb6bc4838b20a10343e8e2b4a55f6d5da0d290e9827f628e2a1bdd92d4a6e1047a85ece5c
WHIRLPOOL
dc37e55b851a91ac4c0927ab4a12a6a2585622db0f86714741d7eb2dac45ec29dab69a740bc982af639048dd25fcb3803000eef66477900a5476aae2262d6af3
diff --git
a/net-misc/seafile-client/files/seafile-client-6.0.4-select-qt5.patch
b/net-misc/seafile-client/files/seafile-client-select-qt5.patch
similarity index 100%
rename from net-misc/seafile-client/files/seafile-client-6.0.4-select-qt5.patch
rename to net-misc/seafile-client/files/seafile-client-select-qt5.patch
diff --git a/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
b/net-misc/seafile-client/seafile-client-6.0.4-r3.ebuild
similarity index 96%
copy from net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
copy to net-misc/seafile-client/seafile-client-6.0.4-r3.ebuild
index b417c30619c..df361f9dff9 100644
--- a/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.0.4-r3.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )"
src_prepare() {
- eapply "${FILESDIR}/${P}-select-qt5.patch"
+ eapply "${FILESDIR}/${PN}-select-qt5.patch"
eapply "${FILESDIR}/${P}-only-use-qttest-where-needed.patch"
cmake-utils_src_prepare
if use shibboleth ; then
diff --git a/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
b/net-misc/seafile-client/seafile-client-6.0.6.ebuild
similarity index 91%
rename from net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
rename to net-misc/seafile-client/seafile-client-6.0.6.ebuild
index b417c30619c..69b7bcb82bb 100644
--- a/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.0.6.ebuild
@@ -32,8 +32,7 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )"
src_prepare() {
- eapply "${FILESDIR}/${P}-select-qt5.patch"
- eapply "${FILESDIR}/${P}-only-use-qttest-where-needed.patch"
+ eapply "${FILESDIR}/${PN}-select-qt5.patch"
cmake-utils_src_prepare
if use shibboleth ; then
if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/, net-misc/seafile-client/files/
commit: 0b01ca373c77869e8ea182cc848428a738c2fc22
Author: Moritz Schlarb metalabs de>
AuthorDate: Wed Apr 26 17:29:21 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Apr 27 14:33:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b01ca37
net-misc/seafile-client: Fix Qt5 selection
Closes: https://bugs.gentoo.org/show_bug.cgi?id=602440#c1
.../files/seafile-client-6.0.4-select-qt5.patch| 18 ++
...-6.0.4-r1.ebuild => seafile-client-6.0.4-r2.ebuild} | 4 ++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git
a/net-misc/seafile-client/files/seafile-client-6.0.4-select-qt5.patch
b/net-misc/seafile-client/files/seafile-client-6.0.4-select-qt5.patch
new file mode 100644
index 000..ed48dcf4757
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-6.0.4-select-qt5.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4261fba..24fbbda 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -158,11 +158,8 @@ SET(QT_VERSION_MAJOR 5)
+ # have to keep using QtWebKit on windows because QtWebEngine can't be
+ # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be
+ # compiled with MSVC.)
+-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe)
+-EXECUTE_PROCESS(COMMAND
+-bash -c "${qmake_executable} --version | grep -iE '^using qt version
[0-9.]+' | awk '{print $4}'"
+-OUTPUT_VARIABLE DETECTED_QT_VERSION
+-OUTPUT_STRIP_TRAILING_WHITESPACE)
++FIND_PACKAGE(Qt5Core)
++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION})
+ MESSAGE("qt5 version: ${DETECTED_QT_VERSION}")
+ IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)
+ ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT)
diff --git a/net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild
b/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
similarity index 91%
rename from net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild
rename to net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
index 1f1aa3a7483..b417c30619c 100644
--- a/net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )"
src_prepare() {
- eapply "${FILESDIR}/${P}-only-use-qttest-when-needed.patch"
+ eapply "${FILESDIR}/${P}-select-qt5.patch"
+ eapply "${FILESDIR}/${P}-only-use-qttest-where-needed.patch"
cmake-utils_src_prepare
if use shibboleth ; then
if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
@@ -42,7 +43,6 @@ src_prepare() {
}
src_configure() {
- export QT_SELECT=qt5
local mycmakeargs=(
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-DBUILD_TESTING="$(usex test)"
[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/, net-misc/seafile-client/files/
commit: 25a56e558e96e6c39c511221704cf4749814a2f3
Author: Moritz Schlarb metalabs de>
AuthorDate: Mon Apr 24 06:23:36 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Apr 26 14:04:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a56e55
net-misc/seafile-client: Fix tests and dependencies
Bug: https://bugs.gentoo.org/615838
Closes: https://github.com/gentoo/gentoo/pull/4489
...client-6.0.4-only-use-qttest-where-needed.patch | 24 ++
...6.0.4.ebuild => seafile-client-6.0.4-r1.ebuild} | 7 +--
2 files changed, 29 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000..c9dfea1d2f9
--- /dev/null
+++
b/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20860a6..4261fba 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -176,7 +176,7 @@ ELSE()
+ ENDIF()
+
+ SET(USE_QT_LIBRARIES
+-Core Gui Widgets LinguistTools Network Test
++Core Gui Widgets LinguistTools Network
+ )
+ IF (BUILD_SHIBBOLETH_SUPPORT)
+ SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} ${WEBENGINE_CORE} ${WEBKIT_NAME}
${WEBKIT_WIDGETS_NAME})
+@@ -814,7 +814,9 @@ IF (BUILD_TESTING)
+ SET_TARGET_PROPERTIES(${testname} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests )
+
+-QT5_USE_MODULES(${testname} ${USE_QT_LIBRARIES})
++INCLUDE_DIRECTORIES(${Qt5Test_INCLUDE_DIRS})
++
++QT5_USE_MODULES(${testname} ${USE_QT_LIBRARIES} Test)
+
+ ADD_TEST(${testname} ${CMAKE_CURRENT_BINARY_DIR}/tests/${testname})
+
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
similarity index 86%
rename from net-misc/seafile-client/seafile-client-6.0.4.ebuild
rename to net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild
index c4262682b99..1f1aa3a7483 100644
--- a/net-misc/seafile-client/seafile-client-6.0.4.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth"
+IUSE="shibboleth test"
RDEPEND="net-libs/libsearpc
=net-libs/ccnet-${PV}
@@ -28,9 +28,11 @@ RDEPEND="net-libs/libsearpc
dev-qt/qtdbus:5
shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )"
src_prepare() {
+ eapply "${FILESDIR}/${P}-only-use-qttest-when-needed.patch"
cmake-utils_src_prepare
if use shibboleth ; then
if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
@@ -43,6 +45,7 @@ src_configure() {
export QT_SELECT=qt5
local mycmakeargs=(
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+ -DBUILD_TESTING="$(usex test)"
)
cmake-utils_src_configure
}
