| 1 |
commit: a72cbbc68e0655cadf6eed1e77363b10a663478a |
| 2 |
Author: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 3 10:43:49 2022 +0000 |
| 4 |
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 3 10:44:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72cbbc6 |
| 7 |
|
| 8 |
net-misc/seafile-client: Don't call qmake during build |
| 9 |
|
| 10 |
Fixes call to command that does not exist. |
| 11 |
|
| 12 |
Does not change build process or installed files. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/836689 |
| 15 |
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/seafile-client-8.0.6-select-qt5.patch | 11 ++++++++--- |
| 18 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch |
| 21 |
index 8b8e6d55aa08..4d3a3d172644 100644 |
| 22 |
--- a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch |
| 23 |
+++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 26 |
-index 1c4a444..aae406c 100644 |
| 27 |
+index 1c4a4447..5747df46 100644 |
| 28 |
--- a/CMakeLists.txt |
| 29 |
+++ b/CMakeLists.txt |
| 30 |
-@@ -133,11 +133,8 @@ ENDIF() |
| 31 |
+@@ -133,14 +133,12 @@ ENDIF() |
| 32 |
#################### |
| 33 |
###### BEGIN: QT configuration |
| 34 |
#################### |
| 35 |
@@ -14,5 +14,10 @@ index 1c4a444..aae406c 100644 |
| 36 |
+FIND_PACKAGE(Qt5Core) |
| 37 |
+SET(DETECTED_QT_VERSION ${Qt5Core_VERSION}) |
| 38 |
MESSAGE("Qt version: ${DETECTED_QT_VERSION}") |
| 39 |
++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION) |
| 40 |
EXECUTE_PROCESS(COMMAND |
| 41 |
- bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" |
| 42 |
+- bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" |
| 43 |
++ bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" |
| 44 |
+ OUTPUT_VARIABLE QT_VERSION_MAJOR |
| 45 |
+ OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 46 |
+ MESSAGE("QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}") |
Archives