From nobody Sun Mar 12 09:45:03 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PZFJH4z2sz3xfkl; Sun, 12 Mar 2023 09:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PZFJH4X84z4Hsb; Sun, 12 Mar 2023 09:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678614303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6/0RQN7r8km5NlDnVz2FQXJnhA4oTWs2o3tVjruO6I=; b=ymMaiBR0CWnOHlJLA4Z3k7qnYr/BiZI1V2QaRUwCi4w4mTj/xnmoAQ/zHtdLwh8LA9Ap9f 6GGVAG90Wt1c2ZnTs5rzCI7H0CY7hi7ss64Ipmh8LjO8EaNyg9V1n3Gz69sKLgqxig1XV0 1FCsw3j3MEINnFMng4ZaLIwoewpuN8qPYZt3ShvGygMvCKRVtW6hs4S78e4PwFdmu4iFH8 PHQ5OeGZJCh4pbCsNhF5S5sMfoR7noYKcYmOfDHktl3y5cpMffi4yFORePEw1Q77rCUWi3 TxxrxzX3DVJvhJlVmxiUCOaTSJWaMYHPcIXgmk4eZeiN6xl8f2mrDs2lVjgIPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678614303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6/0RQN7r8km5NlDnVz2FQXJnhA4oTWs2o3tVjruO6I=; b=MJqkNxObQz4SHxasWl8YY49uBoK/MZSnILtf7m+0ZdmMQjNCfxfo6USSokdqNFi4Gi+Yze TVlX9R1bPCVY4fqUnNaJOz54WstyYNgdG66SETiGbsUeYc5FklKia9HvRljRBJ0XJ5Xhk5 EF2nX6YU3VRO9BgngkqAH/CJfpukup61c6q73e5NrGHIH5Jd+GGwO+7gNwW8oFgIWJIecS dbc621uKbDN/rebdvgxeMok5qhDR8w57OC/4olH4F9YsmRmEvjSOaxNckg3yJLsKmyeLRV v9QXZ1CtPpZzFhzmhT08DJmgQTzIVERVkm8j7ryRUNJ+9W/3GV/Pl6L7R3+rjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678614303; a=rsa-sha256; cv=none; b=bPHT9EkUCFSHl/zPysk4Drv1EqBJakmh79FTv1T1QZ9yw8Nd9PFFcZbbHue50X5/4dQ1CI fKL98xQzUMq3nqNl+LeLNRI8VYz64p0qXu1o9kWD+5rF+lRO4hA9yT/hkkcbeSVS8eSr/L ukp9xFQuhUouX/iLLlETJ+mptrCATSr8Q3q4mWczkNUlQNM1YkvPKVhR0loAYVA0IGqO+4 y3RAKxnQ9jaw5SaHL+/iURTkaiQtBJF9MiyPRtHe/g6h8RZ2KZfAZPz9WgTOLWDfDUDU43 hCCUKlvJvO5uaIFFWPR9BXODBIGm5wJ1WKudDFbMoVnvg/IGeYhyBBfgsnAspA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PZFJH3HQnz15Wf; Sun, 12 Mar 2023 09:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32C9j3eC064952; Sun, 12 Mar 2023 09:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32C9j3VE064951; Sun, 12 Mar 2023 09:45:03 GMT (envelope-from git) Date: Sun, 12 Mar 2023 09:45:03 GMT Message-Id: <202303120945.32C9j3VE064951@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: d196d2e2510a - main - deskutils/nextcloudclient: Update to 3.7.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d196d2e2510aedbfd1134d5358ab0e961f12e964 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=d196d2e2510aedbfd1134d5358ab0e961f12e964 commit d196d2e2510aedbfd1134d5358ab0e961f12e964 Author: Guido Falsi AuthorDate: 2023-03-12 09:43:51 +0000 Commit: Guido Falsi CommitDate: 2023-03-12 09:43:51 +0000 deskutils/nextcloudclient: Update to 3.7.4 - Improve WEBENGINE option description PR: 269809 Approved by: mr (maintainer) --- deskutils/nextcloudclient/Makefile | 9 ++--- deskutils/nextcloudclient/distinfo | 6 ++-- .../nextcloudclient/files/patch-src_CMakeLists.txt | 41 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index f813752f1246..fcdc524f0710 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,5 +1,5 @@ PORTNAME= nextcloudclient -PORTVERSION= 3.6.6 +PORTVERSION= 3.7.4 #PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= deskutils @@ -15,8 +15,9 @@ LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \ - gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \ + gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \ sqlite ssl +USE_KDE= archive USE_QT= buildtools:build concurrent core dbus declarative graphicaleffects \ gui linguist:build location network printsupport qmake:build \ quickcontrols quickcontrols2 sql svg testlib webchannel websockets \ @@ -36,7 +37,7 @@ OPTIONS_DEFAULT_amd64= WEBENGINE OPTIONS_DEFAULT_i386= WEBENGINE OPTIONS_DEFAULT_aarch64= WEBENGINE -WEBENGINE_DESC= QT5 Webengine support +WEBENGINE_DESC= Use Webengine to provide web login flow #DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ # doxygen:devel/doxygen @@ -59,7 +60,7 @@ post-patch: 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt post-patch-WEBENGINE-off: - @${REINPLACE_CMD} -e '/^find_package.*COMPONENTS WebEngineWidgets WebEngine/d' \ + @${REINPLACE_CMD} -e '/add_compile_definitions(WITH_WEBENGINE=1)/d' \ ${WRKSRC}/src/CMakeLists.txt pre-configure: diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo index 15d3a5e3116d..410bde3898af 100644 --- a/deskutils/nextcloudclient/distinfo +++ b/deskutils/nextcloudclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674408218 -SHA256 (nextcloud-desktop-v3.6.6_GH0.tar.gz) = 04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47 -SIZE (nextcloud-desktop-v3.6.6_GH0.tar.gz) = 15497450 +TIMESTAMP = 1678375641 +SHA256 (nextcloud-desktop-v3.7.4_GH0.tar.gz) = 0d7b888b315293953ac33cb6eb8faa3bbc5b6201896c54c71b4648ec4d6ff597 +SIZE (nextcloud-desktop-v3.7.4_GH0.tar.gz) = 15701243 diff --git a/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt b/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..047f46c2bb70 --- /dev/null +++ b/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt @@ -0,0 +1,41 @@ +--- src/CMakeLists.txt.orig 2023-02-09 20:54:58 UTC ++++ src/CMakeLists.txt +@@ -31,30 +31,16 @@ find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION + ) + + 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() ++set_package_properties(Qt5WebEngineWidgets PROPERTIES ++ DESCRIPTION "Qt5 WebEngineWidgets component." ++ TYPE RECOMMENDED ++) + + 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() ++set_package_properties(Qt5WebEngine PROPERTIES ++ DESCRIPTION "Qt5 WebEngine component." ++ TYPE RECOMMENDED ++) + + if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) + add_compile_definitions(WITH_WEBENGINE=1)