From 92c25b8c1dce3bf438ad225002c2df05a1f37f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Fri, 20 Jan 2023 22:29:25 +0100 Subject: [PATCH 1/8] facelift or the ubuntu build instructions Still does not build for me, it consistelntly explodes with ``` /usr/bin/ld: CMakeFiles/owncloudResources.dir/loadresources.cpp.o: in function `load_rc()': loadresources.cpp:(.text+0x9): undefined reference to `qInitResources_owncloudResources_translations()' ``` I am missing some resource files?? --- modules/ROOT/pages/appendices/building.adoc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index 10740855..74b94ae9 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -86,7 +86,8 @@ To get the source dependencies on Debian and Ubuntu, run the following command: ---- sudo apt install qtdeclarative5-dev libinotifytools-dev \ qt5keychain-dev python3-sphinx \ - libsqlite3-dev + libsqlite3-dev \ + g++ extra-cmake-modules zlib1g-dev pkgconf ---- ==== @@ -291,7 +292,9 @@ git clone git://github.com/owncloud/client.git cd client ---- + -Note master this default, but you can also check out a tag like v2.5.4 +Note that this clone command assumes a connected github account. If you don't have that, use this URL instead: https://github.com/owncloud/client.git ++ +Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be saver you can also check out a tag like v3.1.0-rc.1 or a branch like `3.0`. + [source,bash] ---- @@ -314,14 +317,15 @@ cd client-build + [source,console] ---- -cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.4 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/../install/ .. +cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.10 -DCMAKE_INSTALL_PREFIX=$(pwd)/../install/ .. ---- + +Please also check the beginning of ../src/CMakeLists.txt - The version number in `find_package(Qt5 5.xx ...` should match what you have available. For Linux builds (using QT5 libraries via build-dep) a typical setting is + [source,console] ---- --DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.4/ +-DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.10/ ---- + However, the version number may vary. For Linux builds using system dependencies `-DCMAKE_PREFIX_PATH` is not needed. You must use absolute paths for the `include` and `library` directories. From 4cfaaa0b4419f60732514ad5cdb0095f7358e7ce Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 23 Jan 2023 16:25:06 +0100 Subject: [PATCH 2/8] Update modules/ROOT/pages/appendices/building.adoc Co-authored-by: Phil Davis --- modules/ROOT/pages/appendices/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index 74b94ae9..7a54129e 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -294,7 +294,7 @@ cd client + Note that this clone command assumes a connected github account. If you don't have that, use this URL instead: https://github.com/owncloud/client.git + -Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be saver you can also check out a tag like v3.1.0-rc.1 or a branch like `3.0`. +Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be safer you can also check out a tag like v3.1.0-rc.1 or a branch like `3.0`. + [source,bash] ---- From ba89c159eaa6c3e9eafe3fa7a2bd2fa332947f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Mon, 13 Feb 2023 16:18:53 +0100 Subject: [PATCH 3/8] Update modules/ROOT/pages/appendices/building.adoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit thanks Co-authored-by: Fabian Müller <80399010+fmoc@users.noreply.github.com> --- modules/ROOT/pages/appendices/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index 7a54129e..f740e030 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -294,7 +294,7 @@ cd client + Note that this clone command assumes a connected github account. If you don't have that, use this URL instead: https://github.com/owncloud/client.git + -Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be safer you can also check out a tag like v3.1.0-rc.1 or a branch like `3.0`. +Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be safer you can also check out a tag like `v3.1.0` or a branch like `3.1`. + [source,bash] ---- From 433a38d5244fbc3fd18e6db0433699fcf4c25c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Tue, 14 Feb 2023 00:34:20 +0100 Subject: [PATCH 4/8] Update building.adoc remove git:// protocol replace by https:// as suggested by @fmoc --- modules/ROOT/pages/appendices/building.adoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index f740e030..ec2d8216 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -288,11 +288,9 @@ To build the most up-to-date version of the Desktop App: + [source,bash] ---- -git clone git://github.com/owncloud/client.git +git clone https://github.com/owncloud/client.git cd client ---- -+ -Note that this clone command assumes a connected github account. If you don't have that, use this URL instead: https://github.com/owncloud/client.git + Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be safer you can also check out a tag like `v3.1.0` or a branch like `3.1`. + From 32e28d162863ec8dd28588a2ddbaa6acbb808d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Tue, 14 Feb 2023 00:39:11 +0100 Subject: [PATCH 5/8] Update building.adoc do not name examples of branches and tags, mention git checkout as suggested by @fmoc --- modules/ROOT/pages/appendices/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index ec2d8216..8bb97e30 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -292,7 +292,7 @@ git clone https://github.com/owncloud/client.git cd client ---- + -Note that `master` is the default here, but it is a moving target and can be temporarily in a broken state. To be safer you can also check out a tag like `v3.1.0` or a branch like `3.1`. +By default, `git` clones the development branch called `master`. This branch often works, but this is not guaranteed. If you want to build a stable release or a specific branch, you can use `git checkout ` inside the cloned `client` directory to switch to another target. You can find a list of all releases [here](https://github.com/owncloud/client/releases). + [source,bash] ---- From 098eb54132d23cdc365f2f4bd37a834c689416a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Tue, 14 Feb 2023 01:05:19 +0100 Subject: [PATCH 6/8] setting CMAKE_INSTALL_PREFIX to /usr as suggested by @fmoc --- modules/ROOT/pages/appendices/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index 8bb97e30..d0f6cb5c 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -315,7 +315,7 @@ cd client-build + [source,console] ---- -cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.10 -DCMAKE_INSTALL_PREFIX=$(pwd)/../install/ .. +cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.10 -DCMAKE_INSTALL_PREFIX=/usr/ .. ---- + Please also check the beginning of ../src/CMakeLists.txt - The version number in `find_package(Qt5 5.xx ...` should match what you have available. From 2aa8466384d1608d32ab3119919dd1ffedbaae05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Thu, 16 Feb 2023 13:04:54 +0100 Subject: [PATCH 7/8] Use 5.15.2 as a default qt version. --- modules/ROOT/pages/appendices/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index d0f6cb5c..72c511da 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -315,7 +315,7 @@ cd client-build + [source,console] ---- -cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.12.10 -DCMAKE_INSTALL_PREFIX=/usr/ .. +cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.15.2 -DCMAKE_INSTALL_PREFIX=/usr/ .. ---- + Please also check the beginning of ../src/CMakeLists.txt - The version number in `find_package(Qt5 5.xx ...` should match what you have available. From 8555f97239034025aff1e7d3d3cc987670e7567c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Thu, 16 Feb 2023 13:08:12 +0100 Subject: [PATCH 8/8] explain which qt for which client. --- modules/ROOT/pages/appendices/building.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ROOT/pages/appendices/building.adoc b/modules/ROOT/pages/appendices/building.adoc index 72c511da..558acbe3 100644 --- a/modules/ROOT/pages/appendices/building.adoc +++ b/modules/ROOT/pages/appendices/building.adoc @@ -319,6 +319,7 @@ cmake -DCMAKE_PREFIX_PATH=/opt/ownCloud/qt-5.15.2 -DCMAKE_INSTALL_PREFIX=/usr/ . ---- + Please also check the beginning of ../src/CMakeLists.txt - The version number in `find_package(Qt5 5.xx ...` should match what you have available. +For client 3.0 or later we use Qt 5.15.2 - for client 2.x we used Qt 5.12.10 or below. For Linux builds (using QT5 libraries via build-dep) a typical setting is + [source,console]