| 1 |
commit: 0b01ca373c77869e8ea182cc848428a738c2fc22 |
| 2 |
Author: Moritz Schlarb <moschlar <AT> metalabs <DOT> de> |
| 3 |
AuthorDate: Wed Apr 26 17:29:21 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 27 14:33:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b01ca37 |
| 7 |
|
| 8 |
net-misc/seafile-client: Fix Qt5 selection |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=602440#c1 |
| 11 |
|
| 12 |
.../files/seafile-client-6.0.4-select-qt5.patch | 18 ++++++++++++++++++ |
| 13 |
...-6.0.4-r1.ebuild => seafile-client-6.0.4-r2.ebuild} | 4 ++-- |
| 14 |
2 files changed, 20 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..ed48dcf4757 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-misc/seafile-client/files/seafile-client-6.0.4-select-qt5.patch |
| 21 |
@@ -0,0 +1,18 @@ |
| 22 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 23 |
+index 4261fba..24fbbda 100644 |
| 24 |
+--- a/CMakeLists.txt |
| 25 |
++++ b/CMakeLists.txt |
| 26 |
+@@ -158,11 +158,8 @@ SET(QT_VERSION_MAJOR 5) |
| 27 |
+ # have to keep using QtWebKit on windows because QtWebEngine can't be |
| 28 |
+ # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be |
| 29 |
+ # compiled with MSVC.) |
| 30 |
+-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe) |
| 31 |
+-EXECUTE_PROCESS(COMMAND |
| 32 |
+- bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" |
| 33 |
+- OUTPUT_VARIABLE DETECTED_QT_VERSION |
| 34 |
+- OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 35 |
++FIND_PACKAGE(Qt5Core) |
| 36 |
++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION}) |
| 37 |
+ MESSAGE("qt5 version: ${DETECTED_QT_VERSION}") |
| 38 |
+ IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0) |
| 39 |
+ ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT) |
| 40 |
|
| 41 |
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 |
| 42 |
similarity index 91% |
| 43 |
rename from net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild |
| 44 |
rename to net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild |
| 45 |
index 1f1aa3a7483..b417c30619c 100644 |
| 46 |
--- a/net-misc/seafile-client/seafile-client-6.0.4-r1.ebuild |
| 47 |
+++ b/net-misc/seafile-client/seafile-client-6.0.4-r2.ebuild |
| 48 |
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND} |
| 49 |
test? ( dev-qt/qttest:5 )" |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
- eapply "${FILESDIR}/${P}-only-use-qttest-when-needed.patch" |
| 53 |
+ eapply "${FILESDIR}/${P}-select-qt5.patch" |
| 54 |
+ eapply "${FILESDIR}/${P}-only-use-qttest-where-needed.patch" |
| 55 |
cmake-utils_src_prepare |
| 56 |
if use shibboleth ; then |
| 57 |
if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then |
| 58 |
@@ -42,7 +43,6 @@ src_prepare() { |
| 59 |
} |
| 60 |
|
| 61 |
src_configure() { |
| 62 |
- export QT_SELECT=qt5 |
| 63 |
local mycmakeargs=( |
| 64 |
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" |
| 65 |
-DBUILD_TESTING="$(usex test)" |
Archives