From nobody Sat Oct 26 05:43:38 2024 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 4Xb7qb1wWDz5bZjl; Sat, 26 Oct 2024 05:43:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xb7qZ6NStz4kHD; Sat, 26 Oct 2024 05:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729921418; 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=a9kp4H5NdirGRFt5YPiw6iDENKHLn1IxyyNQlL8RtYo=; b=WvsmZJg8UN0lGvASnKFmKvVSKqIr5agct//MA5pXkMu2lspKn04fMZO07pwhiH6BdrQohS UsGQgD89zEqUaGAOV1wJoBTfKPYQIJPaMDD/VLsrbZSV7gw7p162sewQgPSs5anaF4EgeP mqo4aMaIzQN6Xf8OTKAip9JVulZTqI5etvp8w01f+mPd3E9b+TX9JyU3ujerJ7/yFcZgJC H+7njoqxjxrgucyp8Crx9TDizg9yj2meezyojCpQVe6hvdMxtJeE5QmzZw6xUcQNGoHaDx jJG3JOs2LEhe83fhsjWq7g3QJas75Q88Rkbzbjbyr9lUs0vwjcKk9Dj/fYiZAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729921418; 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=a9kp4H5NdirGRFt5YPiw6iDENKHLn1IxyyNQlL8RtYo=; b=ZbOADx0S4z8VFi3j0aFzgDISWWSXHBQJdLOaQ2FbGmNMEZWYXqJFgvpetMU5k5WP35UpZE WZ2o/0nkhAp+x9U9xdTdn5SCny6GbpDY+vFvrfEkyTj0hOnhS5y1XBcScwbPILMMUviEQb Ya7r0BgqHFsqJSJkkm90uvcicpCSHab/0os2S26ShpKCOzj9ziATp5iANwELqI8IvINrUs OEawqzkdfB4PtJWzqDtqD04mQAQe/wYk427NGQUvPuKa1C+e7pgV50AV/1rxgTTV3sn+h7 lI6dUqMesm5RzHyzPk1lcFvce6n1Vs67IdJ2RrOq0gQVxjfcF7gxO7oSuNalNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729921418; a=rsa-sha256; cv=none; b=gcUyMp8iK4WwSe2wo5ASy+UvG7pvlkMmBwxLhWo4bPWwVJyjIjCmntFbDgpgLXoGdzXJCY Ha6EHPoCROR8kGXWbQgzoQqgRLKvly/0cEIpPRuiKKWzmKVRnO884wHV6+QqVJFYsJKHXm m2xAaJXU+U9Q1Q4KsfluhdV3JmZuyahR28QeIHpOP3iPJ9LzHzK3vDwtDdn+k0dOuv+qI6 kkVp8yhFumCo493dTOBpuY3qZn+bTZCJdfeVcxRSphBvDKVFwBvWqRF8/Yfm6ZTT1qqJ5m WvIYB9DTTcR7v8BvzWWTX5kMyKGmwWsW4hgKabAM3sJIj3LnnfeWO5rE/r22uw== 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 4Xb7qZ5FdMzxQy; Sat, 26 Oct 2024 05:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49Q5hcWS062293; Sat, 26 Oct 2024 05:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49Q5hc0V062290; Sat, 26 Oct 2024 05:43:38 GMT (envelope-from git) Date: Sat, 26 Oct 2024 05:43:38 GMT Message-Id: <202410260543.49Q5hc0V062290@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: 59a0f90d1fb2 - main - x11-toolkits/qml-box2d: Update to latest commit 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 59a0f90d1fb2a8d254eb48b333603de7e8c8917f Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=59a0f90d1fb2a8d254eb48b333603de7e8c8917f commit 59a0f90d1fb2a8d254eb48b333603de7e8c8917f Author: Jason E. Hale AuthorDate: 2024-10-26 04:38:25 +0000 Commit: Jason E. Hale CommitDate: 2024-10-26 05:43:28 +0000 x11-toolkits/qml-box2d: Update to latest commit Flavorize for Qt5 and Qt6. Add LICENSE (ZLIB). Upstream switched build system to CMake. Adapt consumers to the new plugin name and location. --- games/gcompris-qt/Makefile | 17 +++++++++++++---- x11-toolkits/qml-box2d/Makefile | 28 +++++++++++++++++++++------- x11-toolkits/qml-box2d/distinfo | 6 +++--- x11-toolkits/qml-box2d/pkg-plist | 4 ++-- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/games/gcompris-qt/Makefile b/games/gcompris-qt/Makefile index c60164d4801b..830691988aa7 100644 --- a/games/gcompris-qt/Makefile +++ b/games/gcompris-qt/Makefile @@ -1,5 +1,6 @@ PORTNAME= gcompris-qt DISTVERSION= 4.1 +PORTREVISION= 1 CATEGORIES= games education kde MASTER_SITES= https://gcompris.net/download/qt/src/ @@ -7,12 +8,14 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Educational games and activities for kids ages 2 to 10 WWW= https://gcompris.net/ -LICENSE= AGPLv3 GPLv3 -LICENSE_COMB= multi +LICENSE= AGPLv3 GPLv3 +LICENSE_COMB= multi LICENSE_FILE_AGPLv3= ${WRKSRC}/LICENSES/AGPL-3.0-only.txt LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt -LIB_DEPENDS= libBox2D.so:x11-toolkits/qml-box2d +# libqmlbox2d.so is a QML plugin...don't use LIB_DEPENDS +BUILD_DEPENDS= ${_BOX2D_PATH}/libqmlbox2d.so:x11-toolkits/qml-box2d@qt5 +RUN_DEPENDS= ${_BOX2D_PATH}/libqmlbox2d.so:x11-toolkits/qml-box2d@qt5 USES= cmake kde:5 qt:5 tar:xz USE_KDE= doctools:build ecm:build @@ -21,6 +24,12 @@ USE_QT= charts core declarative graphicaleffects gui multimedia \ buildtools:build linguisttools:build qmake:build testlib:build \ imageformats:run -CMAKE_ARGS= -DQML_BOX2D_LIBRARY=${QT_QMLDIR}/Box2D.2.0 +CMAKE_ARGS= -DQML_BOX2D_LIBRARY=${_BOX2D_PATH} + +_BOX2D_PATH= ${QT_QMLDIR}/Box2D + +post-patch: + ${REINPLACE_CMD} -e 's|Box2D\.2\.0|Box2D|g' \ + ${WRKSRC}/src/core/ApplicationInfo.cpp .include diff --git a/x11-toolkits/qml-box2d/Makefile b/x11-toolkits/qml-box2d/Makefile index 48f86cdf84e2..8d8c3a6545d5 100644 --- a/x11-toolkits/qml-box2d/Makefile +++ b/x11-toolkits/qml-box2d/Makefile @@ -1,18 +1,32 @@ PORTNAME= qml-box2d -DISTVERSION= 2.0.20180109 -PORTREVISION= 5 +DISTVERSION= 2.0.20240415 CATEGORIES= x11-toolkits +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= QML Box2D plugin WWW= https://github.com/qml-box2d/qml-box2d -USES= compiler:c++11-lang gl qmake:outsource qt:5 +LICENSE= ZLIB +LICENSE_FILE= ${WRKSRC}/COPYING + +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake compiler:c++11-lang gl qt:${FLAVOR:S/qt//} USE_GITHUB= yes -GH_TAGNAME= 21e57f -USE_GL= gl -USE_QT= core declarative gui network \ +GH_TAGNAME= 3a85439 +_USE_GL=qt5= # empty +_USE_GL_qt6= gl opengl # glx +USE_GL= ${_USE_GL_${FLAVOR}} +_USE_QT_qt5= core declarative gui network \ buildtools:build qmake:build -USE_LDCONFIG= ${QT_QMLDIR}/Box2D.2.0/ +_USE_QT_qt6= base declarative +USE_QT= ${_USE_QT_${FLAVOR}} + +CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR:STRING="${QT_QMLDIR}" +_CMAKE_OFF_qt5= USE_QT6 +CMAKE_OFF= BUILD_EXAMPLES \ + ${_CMAKE_OFF_${FLAVOR}} .include diff --git a/x11-toolkits/qml-box2d/distinfo b/x11-toolkits/qml-box2d/distinfo index f5a504e49fb1..4d12155201a1 100644 --- a/x11-toolkits/qml-box2d/distinfo +++ b/x11-toolkits/qml-box2d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518295822 -SHA256 (qml-box2d-qml-box2d-2.0.20180109-21e57f_GH0.tar.gz) = 71b72949dd5a46fc1ba42c4de218d56c308733fa65ffb1319316503e41250f2f -SIZE (qml-box2d-qml-box2d-2.0.20180109-21e57f_GH0.tar.gz) = 7768436 +TIMESTAMP = 1729483010 +SHA256 (qml-box2d-qml-box2d-2.0.20240415-3a85439_GH0.tar.gz) = 97056b340ad81344fd6d26e2c7226f428d313c474c7131870c15bf24a2896477 +SIZE (qml-box2d-qml-box2d-2.0.20240415-3a85439_GH0.tar.gz) = 7772229 diff --git a/x11-toolkits/qml-box2d/pkg-plist b/x11-toolkits/qml-box2d/pkg-plist index 0e2d62e6a366..9f1bea8c4a9d 100644 --- a/x11-toolkits/qml-box2d/pkg-plist +++ b/x11-toolkits/qml-box2d/pkg-plist @@ -1,2 +1,2 @@ -%%QT_QMLDIR%%/Box2D.2.0/libBox2D.so -%%QT_QMLDIR%%/Box2D.2.0/qmldir +%%QT_QMLDIR%%/Box2D/libqmlbox2d.so +%%QT_QMLDIR%%/Box2D/qmldir