From nobody Sat Dec 09 05:12:47 2023 X-Original-To: dev-commits-ports-all@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 4SnGNb3VDPz53L5f; Sat, 9 Dec 2023 05:12:47 +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 4SnGNb2thRz3gwf; Sat, 9 Dec 2023 05:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702098767; 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=+QfA45tet4XEId3341Ag4v5+rmBSYA9cxnxgutFzxfE=; b=YLpkD0Jvq9HVwbRlrvImHAW4RXMjkrmKXKA6mjosyC6a667Bw4X1+uxKt2crb9DbYhlRbC 0QoU68UGCk+RQuy4ie2+NIF4Tx7RTJhjGy8RVc/rJUzfcgjZl+cxQOk8pvZFBFLZRpImkz Ebe0Xgr2NPla83UDi3dOB++UXl6ls/yDlK312xmhMc+D+KzwY+EpLQJJ3VBxcVInBDcLtX xbQ85QjQpO3Mv08UYkyhVtDvGgO0zVhaV9E+SawNpWdZBmZGz1biuf33OiKybYVBk5iZUF hn9AcRwqUeTHsG1+dnG+2/jUyg1VzLK4/cA+EOZyt8e7QiiKTAGgWEjrAwXHnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702098767; a=rsa-sha256; cv=none; b=Ban4m/4CY8f9efOXcahV6XRfD+BNj38QC81yRfXw2++TnEy0xfa6GINledX1Dj1qu2d/HU tk8k7ygUKZpchM0TnvTQuwSQac2dE7ZRJxxkP/eoDVL77s3hjOuCBglhLN/EzwtcouWTTj +4KdwmS0afAXEdABMhG9GNtfnnRg2Gb5uttKLC7LoxtkLCAk8h2oEyQMJPEM6X2vSmhv88 K6ZdpU41elNcxk+ncbqkqbsD3PWuy7ndEh6qVVsnRyJRXo9+Y5Siw3XnV19WHCNRWJ6GCR E97R2tkjeuCPg4S42GuOM1hBJ75LDsZB3AXXUbJ55IZalAe9j3qMP8fIiIreww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702098767; 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=+QfA45tet4XEId3341Ag4v5+rmBSYA9cxnxgutFzxfE=; b=DQHfBERM8rNo6iCHLE3STRFsAAFO6O5ULpI1hwwX8C4TlBjMHN3oxMvqjxhqaPVLNcPbhD fumUOM1wuboI+daTmtCcfFvwyQiuUI/71GWVa9uvjXTbxUWWZFT+bXUUbGiAgMsBSpSChZ goqJTSkLWnUgKhEkfWNohNjACToARZ+qUrznUPYjIlBDQDHcOJDaqqo5TxRChapvx1jiYh btPfqE3m9fPjRbXgOUZ1SCHkxTdDIfV4PxbJctjuojQ9R/zBVPoSBRVk2ft5DKISwVeM0J XH7sVU9XPLMdtnSZW4Kst1hW7JVUyyv6anOgjprYJmAexoKUeA8Amvoc7Yqjyg== 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 4SnGNb1xVczry1; Sat, 9 Dec 2023 05:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B95ClG7045086; Sat, 9 Dec 2023 05:12:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B95ClgN045083; Sat, 9 Dec 2023 05:12:47 GMT (envelope-from git) Date: Sat, 9 Dec 2023 05:12:47 GMT Message-Id: <202312090512.3B95ClgN045083@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 49cfbca9d02a - main - devel/qcoro: Update to 0.10.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49cfbca9d02a40730c8daf3988d1b5c162d2276c Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=49cfbca9d02a40730c8daf3988d1b5c162d2276c commit 49cfbca9d02a40730c8daf3988d1b5c162d2276c Author: Jason E. Hale AuthorDate: 2023-12-08 07:07:15 +0000 Commit: Jason E. Hale CommitDate: 2023-12-09 05:12:11 +0000 devel/qcoro: Update to 0.10.0 Switch to using shared libraries and clean up deps in dependencies. https://github.com/danvratil/qcoro/releases/tag/v0.10.0 --- devel/qcoro/Makefile | 18 ++++++++++++------ devel/qcoro/distinfo | 6 +++--- devel/qcoro/pkg-plist | 32 ++++++++++++++++++++++++++------ graphics/kontrast/Makefile | 10 +++++++--- graphics/kontrast/distinfo | 2 ++ net-im/kaccounts-integration/Makefile | 17 ++++++++--------- net-im/neochat/Makefile | 17 ++++++++--------- net/kdenetwork-filesharing/Makefile | 5 +++-- 8 files changed, 69 insertions(+), 38 deletions(-) diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile index 8402d55a331b..e7e1fc7d74f1 100644 --- a/devel/qcoro/Makefile +++ b/devel/qcoro/Makefile @@ -1,6 +1,6 @@ PORTNAME= qcoro DISTVERSIONPREFIX= v -DISTVERSION= 0.9.0 +DISTVERSION= 0.10.0 CATEGORIES= devel kde PKGNAMESUFFIX= -${FLAVOR} @@ -14,18 +14,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSES/MIT.txt FLAVORS= qt5 qt6 FLAVOR?= qt5 -USES= cmake compiler:c++17-lang pkgconfig qt:${FLAVOR:S/qt//} +USES= cmake compiler:c++20-lang gl pkgconfig qt:${FLAVOR:S/qt//} USE_GITHUB= yes GH_ACCOUNT= danvratil -_USE_QT_qt5= concurrent core dbus declarative network testlib websockets \ - buildtools:build qmake:build -_USE_QT_qt6= base websockets +_USE_GL_qt5= # empty +_USE_GL_qt6= opengl +USE_GL= ${_USE_GL_${FLAVOR}} +_USE_QT_qt5= core dbus declarative gui network websockets \ + buildtools:build concurrent:build qmake:build testlib:build +_USE_QT_qt6= base declarative websockets USE_QT= ${_USE_QT_${FLAVOR}} CMAKE_OFF= QCORO_BUILD_EXAMPLES +CMAKE_ON= BUILD_SHARED_LIBS CMAKE_ARGS= -DUSE_QT_VERSION=${FLAVOR:S/qt//} -PLIST_SUB= QT_VER=${FLAVOR:S/qt//} +PLIST_SUB= QT_VER=${FLAVOR:S/qt//} \ + SHORTVER=${DISTVERSION:R:R} \ + FULLVER=${DISTVERSION} .include diff --git a/devel/qcoro/distinfo b/devel/qcoro/distinfo index 69d1bf8ccab4..68694078d8da 100644 --- a/devel/qcoro/distinfo +++ b/devel/qcoro/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682703175 -SHA256 (danvratil-qcoro-v0.9.0_GH0.tar.gz) = cfaf6b778450f06adac4ce5e353eb6eae213a3b62b8c8740520d58cf9fe3ec1a -SIZE (danvratil-qcoro-v0.9.0_GH0.tar.gz) = 143270 +TIMESTAMP = 1701911182 +SHA256 (danvratil-qcoro-v0.10.0_GH0.tar.gz) = b7c8f00273ad27d85814bf4ec93eb6922c75656800a61d11854d36355a4a1aec +SIZE (danvratil-qcoro-v0.10.0_GH0.tar.gz) = 150114 diff --git a/devel/qcoro/pkg-plist b/devel/qcoro/pkg-plist index 660e3d1753f3..5e68cb11892a 100644 --- a/devel/qcoro/pkg-plist +++ b/devel/qcoro/pkg-plist @@ -29,6 +29,14 @@ include/qcoro%%QT_VER%%/QCoro/Task include/qcoro%%QT_VER%%/qcoro/concepts_p.h include/qcoro%%QT_VER%%/qcoro/config.h include/qcoro%%QT_VER%%/qcoro/coroutine.h +include/qcoro%%QT_VER%%/qcoro/impl/connect.h +include/qcoro%%QT_VER%%/qcoro/impl/isqprivatesignal.h +include/qcoro%%QT_VER%%/qcoro/impl/task.h +include/qcoro%%QT_VER%%/qcoro/impl/taskawaiterbase.h +include/qcoro%%QT_VER%%/qcoro/impl/taskfinalsuspend.h +include/qcoro%%QT_VER%%/qcoro/impl/taskpromise.h +include/qcoro%%QT_VER%%/qcoro/impl/taskpromisebase.h +include/qcoro%%QT_VER%%/qcoro/impl/waitfor.h include/qcoro%%QT_VER%%/qcoro/macros_p.h include/qcoro%%QT_VER%%/qcoro/qcoro.h include/qcoro%%QT_VER%%/qcoro/qcoroabstractsocket.h @@ -98,12 +106,24 @@ lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsConfig.cmake lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsConfigVersion.cmake lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsTargets.cmake -lib/libQCoro%%QT_VER%%Core.a -lib/libQCoro%%QT_VER%%DBus.a -lib/libQCoro%%QT_VER%%Network.a -lib/libQCoro%%QT_VER%%Qml.a -lib/libQCoro%%QT_VER%%Quick.a -lib/libQCoro%%QT_VER%%WebSockets.a +lib/libQCoro%%QT_VER%%Core.so +lib/libQCoro%%QT_VER%%Core.so.%%SHORTVER%% +lib/libQCoro%%QT_VER%%Core.so.%%FULLVER%% +lib/libQCoro%%QT_VER%%DBus.so +lib/libQCoro%%QT_VER%%DBus.so.%%SHORTVER%% +lib/libQCoro%%QT_VER%%DBus.so.%%FULLVER%% +lib/libQCoro%%QT_VER%%Network.so +lib/libQCoro%%QT_VER%%Network.so.%%SHORTVER%% +lib/libQCoro%%QT_VER%%Network.so.%%FULLVER%% +lib/libQCoro%%QT_VER%%Qml.so +lib/libQCoro%%QT_VER%%Qml.so.%%SHORTVER%% +lib/libQCoro%%QT_VER%%Qml.so.%%FULLVER%% +lib/libQCoro%%QT_VER%%Quick.so +lib/libQCoro%%QT_VER%%Quick.so.%%SHORTVER%% +lib/libQCoro%%QT_VER%%Quick.so.%%FULLVER%% +lib/libQCoro%%QT_VER%%WebSockets.so +lib/libQCoro%%QT_VER%%WebSockets.so.%%SHORTVER%% +lib/libQCoro%%QT_VER%%WebSockets.so.%%FULLVER%% %%QT_MKSPECDIR%%/modules/qt_QCoroCore.pri %%QT_MKSPECDIR%%/modules/qt_QCoroCoro.pri %%QT_MKSPECDIR%%/modules/qt_QCoroDBus.pri diff --git a/graphics/kontrast/Makefile b/graphics/kontrast/Makefile index 211d8f802c33..385c96594f91 100644 --- a/graphics/kontrast/Makefile +++ b/graphics/kontrast/Makefile @@ -1,17 +1,21 @@ PORTNAME= kontrast DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics accessibility kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Color contrast checker WWW= https://apps.kde.org/en/kontrast -BUILD_DEPENDS= ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro@qt5 -LIB_DEPENDS= libfuturesql5.so:databases/futuresql +PATCH_SITES= https://invent.kde.org/accessibility/kontrast/-/commit/ +PATCHFILES+= 1fb315a862c30c20e99dd70967ca5be82d249dd4.patch:-p1 + +LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \ + libfuturesql5.so:databases/futuresql USES= compiler:c++11-lang cmake pkgconfig \ kde:5 qt:5 tar:xz -USE_KDE= coreaddons i18n kdeclarative kirigami2 \ +USE_KDE= coreaddons i18n kirigami2 \ ecm:build USE_QT= core dbus declarative gui network quickcontrols2 sql svg widgets \ buildtools:build qmake:build diff --git a/graphics/kontrast/distinfo b/graphics/kontrast/distinfo index 184d85901b53..dd1837164d26 100644 --- a/graphics/kontrast/distinfo +++ b/graphics/kontrast/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1701977531 SHA256 (KDE/release-service/23.08.4/kontrast-23.08.4.tar.xz) = d71d29221ba7db1bcd52e1e7ec369b272a58d0f7ee1d120d585b5a34e04c9fb0 SIZE (KDE/release-service/23.08.4/kontrast-23.08.4.tar.xz) = 211820 +SHA256 (KDE/release-service/23.08.4/1fb315a862c30c20e99dd70967ca5be82d249dd4.patch) = b650f58c22b4eac2710939a9acdc0ca3b5746dbe49a431d01b273c189191c0b8 +SIZE (KDE/release-service/23.08.4/1fb315a862c30c20e99dd70967ca5be82d249dd4.patch) = 1188 diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index 98f4de76d94e..13bfe67c3bb4 100644 --- a/net-im/kaccounts-integration/Makefile +++ b/net-im/kaccounts-integration/Makefile @@ -1,24 +1,23 @@ PORTNAME= kaccounts-integration DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= System to administer web accounts for the KDE desktop WWW= https://projects.kde.org/projects/kdereview/kaccounts-integration -BUILD_DEPENDS= ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro@qt5 -LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib \ +LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \ libaccounts-qt5.so:net-im/libaccounts-qt5 \ - liboauth2plugin.so:sysutils/signon-plugin-oauth2 \ - libsignon-qt5.so:sysutils/signon-qt5 \ - libkeyring-kwallet.so:sysutils/signon-kwallet-extension + libsignon-qt5.so:sysutils/signon-qt5 RUN_DEPENDS= signon-ui:sysutils/signon-ui -USES= cmake compiler:c++11-lang gettext pkgconfig kde:5 \ +USES= cmake compiler:c++11-lang gettext-tools pkgconfig kde:5 \ qt:5 tar:xz -USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \ - i18n iconthemes kcmutils kdeclarative kio service wallet widgetsaddons \ - ecm:build +USE_KDE= config coreaddons dbusaddons i18n kcmutils kdeclarative kio \ + service wallet \ + ecm:build package:build \ + iconthemes:run USE_QT= concurrent core dbus declarative gui network widgets xml \ buildtools:build qmake:build diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile index 04f179b0d21d..5824a2ba2aca 100644 --- a/net-im/neochat/Makefile +++ b/net-im/neochat/Makefile @@ -1,5 +1,6 @@ PORTNAME= neochat DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -9,28 +10,26 @@ WWW= https://invent.kde.org/network/neochat LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-only.txt -LIB_DEPENDS= libcmark.so:textproc/cmark \ +LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \ + libcmark.so:textproc/cmark \ libqt5keychain.so:security/qtkeychain@qt5 \ libolm.so:security/olm BUILD_DEPENDS= libquotient-qt5>=0.8.1:net-im/libquotient@qt5 \ kquickimageeditor>=0.2.0:graphics/kquickimageeditor \ - kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons \ - ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro@qt5 + kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons # Quotient is a static lib, doesn't need to be in RUN_DEPENDS RUN_DEPENDS= kquickimageeditor>=0.2.0:graphics/kquickimageeditor \ kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons -USES= cmake compiler:c++20-lang desktop-file-utils gl kde:5 \ - pkgconfig qt:5 tar:xz -USE_GL= gl +USES= cmake compiler:c++20-lang desktop-file-utils kde:5 \ + pkgconfig qt:5 tar:xz xorg USE_QT= concurrent core dbus declarative graphicaleffects gui imageformats \ multimedia network quickcontrols quickcontrols2 \ - sql svg widgets xml \ + sql widgets xml \ buildtools:build linguist:build qmake:build USE_KDE= auth codecs completion config configwidgets coreaddons dbusaddons \ i18n itemmodels jobwidgets kio kirigami2 service solid sonnet \ - syntaxhighlighting notifications qqc2-desktop-style \ - widgetsaddons windowsystem \ + notifications qqc2-desktop-style widgetsaddons windowsystem \ ecm:build USE_XORG= x11 diff --git a/net/kdenetwork-filesharing/Makefile b/net/kdenetwork-filesharing/Makefile index 73a31714bcb2..27276696e2f2 100644 --- a/net/kdenetwork-filesharing/Makefile +++ b/net/kdenetwork-filesharing/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdenetwork-filesharing DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -7,9 +8,9 @@ COMMENT= KDE Filesharing via Samba BUILD_DEPENDS= ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro@qt5 -USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg +USES= cmake compiler:c++11-lang gettext-tools kde:5 qt:5 tar:xz xorg USE_KDE= auth completion config coreaddons doctools i18n jobwidgets \ - kdeclarative kio package service solid widgetsaddons windowsystem \ + kio service solid widgetsaddons windowsystem \ ecm:build USE_QT= concurrent core dbus declarative gui network widgets \ buildtools:build qmake:build