From: mdkcore0 <mdkcore0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] nextcloud-client: update to 3.7.3
Date: Tue, 07 Mar 2023 17:23:50 +0100 [thread overview]
Message-ID: <20230307162350.qlGejLD-cUu_dyxDaHCDWcO2SlK8VxaDH6tRMhnv5FY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42361@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
There is an updated pull request by mdkcore0 against master on the void-packages repository
https://github.com/mdkcore0/void-packages update-nextcloud
https://github.com/void-linux/void-packages/pull/42361
nextcloud-client: update to 3.7.3
#### Testing the changes
- I tested the changes in this PR: **yes**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)
- armv7l (crossbuild)
- i686-libc
Also:
- Add `karchive` as dependency: https://github.com/nextcloud/desktop/pull/4768
- Add patch to revert mandatory WebEngine dependency: https://github.com/nextcloud/desktop/pull/4875
A patch file from https://github.com/void-linux/void-packages/pull/42361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-nextcloud-42361.patch --]
[-- Type: text/x-diff, Size: 4869 bytes --]
From 586e7321ef1024cb0e99646761283082f4cf6046 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Mon, 20 Feb 2023 10:31:04 -0300
Subject: [PATCH] nextcloud-client: update to 3.7.3
Also:
- Add karchive as dependency [1]
- Add patch to revert mandatory WebEngine dependency [2]
[1] https://github.com/nextcloud/desktop/pull/4768
[2] https://github.com/nextcloud/desktop/pull/4875
---
.../patches/revert-mandatory-webengine.patch | 77 +++++++++++++++++++
srcpkgs/nextcloud-client/template | 7 +-
2 files changed, 80 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
diff --git a/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
new file mode 100644
index 000000000000..76aa42fdf54b
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
@@ -0,0 +1,77 @@
+From 02dd76cdcec49e49b60f99a98dbe241007f548d1 Mon Sep 17 00:00:00 2001
+From: Rodrigo Oliveira <mdkcore@qtrnn.io>
+Date: Thu, 23 Feb 2023 12:56:27 -0300
+Subject: [PATCH] Revert "makes Qt WebEngine optional only on macOS"
+
+This reverts commit b81cdf177d3410db45e6f97eb3575ceddabb73dd.
+---
+ src/CMakeLists.txt | 53 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 51 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a4d06844a..cd3805799 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,57 +4,8 @@ endif()
+
+ include(ECMEnableSanitizers)
+
+-set(REQUIRED_QT_VERSION "5.15.0")
+-
+-find_package(Qt5Core ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Core PROPERTIES
+- DESCRIPTION "Qt5 Core component."
+- TYPE REQUIRED
+-)
+-
+-find_package(Qt5Network ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Network PROPERTIES
+- DESCRIPTION "Qt5 Network component."
+- TYPE REQUIRED
+-)
+-
+-find_package(Qt5Xml ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Xml PROPERTIES
+- DESCRIPTION "Qt5 Xml component."
+- TYPE REQUIRED
+-)
+-
+-find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Concurrent PROPERTIES
+- DESCRIPTION "Qt5 Concurrent component."
+- TYPE REQUIRED
+-)
+-
+-find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-if(APPLE)
+- set_package_properties(Qt5WebEngineWidgets PROPERTIES
+- DESCRIPTION "Qt5 WebEngineWidgets component."
+- TYPE RECOMMENDED
+- )
+-else()
+- set_package_properties(Qt5WebEngineWidgets PROPERTIES
+- DESCRIPTION "Qt5 WebEngineWidgets component."
+- TYPE REQUIRED
+- )
+-endif()
+-
+-find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-if(APPLE)
+- set_package_properties(Qt5WebEngine PROPERTIES
+- DESCRIPTION "Qt5 WebEngine component."
+- TYPE RECOMMENDED
+- )
+-else()
+- set_package_properties(Qt5WebEngine PROPERTIES
+- DESCRIPTION "Qt5 WebEngine component."
+- TYPE REQUIRED
+- )
+-endif()
++find_package(Qt5 5.15 COMPONENTS Core Network Xml Concurrent REQUIRED)
++find_package(Qt5 5.15 COMPONENTS WebEngineWidgets WebEngine)
+
+ if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
+ add_compile_definitions(WITH_WEBENGINE=1)
+--
+2.39.2
+
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..2da0045dd389 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,13 +1,13 @@
# Template file for 'nextcloud-client'
pkgname=nextcloud-client
-version=3.6.6
+version=3.7.3
revision=1
build_style=cmake
configure_args="-Wno-dev"
hostmakedepends="pkg-config inkscape"
makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel
$(vopt_if dolphin 'extra-cmake-modules kio-devel')
$(vopt_if webengine 'qt5-webengine-devel')"
depends="qt5-graphicaleffects"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="https://nextcloud.com/clients/"
changelog="https://github.com/nextcloud/desktop/releases"
distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47
+checksum=4c76a01fe3249a3b6cc8217a20dde1bb12b386ebc9af82e2623e12de2c86e808
# https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
make_check=ci-skip
@@ -76,7 +76,6 @@ nextcloud-client-dolphin_package() {
pkg_install() {
vmove usr/lib/libnextclouddolphinpluginhelper.so
vmove usr/lib/qt5
- vmove usr/share/kservices5
}
}
next prev parent reply other threads:[~2023-03-07 16:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 14:24 [PR PATCH] " mdkcore0
2023-02-20 17:55 ` [PR PATCH] [Updated] " mdkcore0
2023-02-20 20:15 ` mdkcore0
2023-02-20 20:36 ` mdkcore0
2023-02-22 0:30 ` classabbyamp
2023-02-22 0:30 ` classabbyamp
2023-02-22 13:38 ` mdkcore0
2023-02-23 14:27 ` mdkcore0
2023-02-23 14:45 ` TimB87
2023-02-23 15:38 ` mdkcore0
2023-02-23 16:00 ` [PR PATCH] [Updated] " mdkcore0
2023-02-23 20:50 ` ahesford
2023-02-23 20:52 ` ahesford
2023-03-07 16:23 ` mdkcore0 [this message]
2023-03-09 19:02 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230307162350.qlGejLD-cUu_dyxDaHCDWcO2SlK8VxaDH6tRMhnv5FY@z \
--to=mdkcore0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).