From nobody Wed Feb 05 06:42:26 2025 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 4YnrJL5bw3z5mG1w; Wed, 05 Feb 2025 06:42:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnrJL59xXz4DMH; Wed, 05 Feb 2025 06:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738737746; 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=C7CSj0XawiT5aOJc/ohmf3o3zsUv7BcTQz1/H8pj9p4=; b=D4bjxm4rQkcJkuJooV4WEFbd31xCUHbWAbS7COjKEMB5fLQm4BMt7an/jijKnoVtgxZgwO 0F4ym0WxRT/D4dLl+mvRijkT/avtAHBC63bjPeeFJB+WG9lpI3qppWjEWepDH7XnyTeEFz rJnhU8aRGkSUXJJjDxQpMRqu0fgnHJWm4axIQRTj/TEvCWTvIZEq12qClaESy4nVGy8FvR MXKcuBCz+boc5cCvUqIZWGgVJojEPTQK29GOvx0pMV86Z3LCypuONeQYw0ZqJErERwkokG xGE2+UcdxVAv1K6zRhD4DtEDvpv4XN2I6qYhPBKR5gLxytEhW957Rw7re7vEtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738737746; 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=C7CSj0XawiT5aOJc/ohmf3o3zsUv7BcTQz1/H8pj9p4=; b=XdxwdoXftPIAVveOR7/e9m5GBvJaIvdBcvyQEm75dBsRwrEXaiadYDxkmQVxgW1Hh7ZeBt mJVymCVUlahI0W2YA1hbyQ2yNqw8byStYgGBnha3OGpZ2KmlY4vZ2yYOihgn3G8MNNmASq 3v0340JqMahGDE3wS47jUHe+ZrDkJ/jznhzpm6SAQno9fI1o2+ZMHWUKmrzblTLUvXSEVL IOnNh0qRghcTHSPLfHvbKFEcEHmL2a/CmZPzMj17V7IszyvENMiIz9P0hBi/06FMQOMAJG Wa8MgtoekYAgrnmzYwOf+mT4++WGKVv9Ae7micWNSzoOWmpEZpiZ5T21aUOehw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738737746; a=rsa-sha256; cv=none; b=swlNZ3Sd6Td7nuxt/bahhZLB9Gp6pbHByqpwJxDFsTZpWiA46VSnMP11fXGPplGaW3M26Y WacS96enbQmuiX1TvScl/1hmjxaOJ/1+zjxxcDU+owKAetzOAZUYNDnwY7nkvhwnuktksn A5I1xoANQVA7vYyX1fkScwn6QFW6E00gYbhd0EE9NQcHuijKYIj7cHbEKHkHSuaYZpHNst ctCB6VS3QoXYmY37/aS44BeaAIRxAdpCobBb8piCL4Fz+N5d4Z8RqqCg47umzFhk9+EHoP X+QmgAch6mRqUyxiUFiYVwu+v26AFL5RZOxSFANpjRqXEBJeThE5ZXgQszFSyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnrJL4grFzhTt; Wed, 05 Feb 2025 06:42:26 +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 5156gQKS006774; Wed, 5 Feb 2025 06:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5156gQAs006771; Wed, 5 Feb 2025 06:42:26 GMT (envelope-from git) Date: Wed, 5 Feb 2025 06:42:26 GMT Message-Id: <202502050642.5156gQAs006771@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: b85d4d8b2409 - main - audio/kid3: Remove kf5 flavor 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: b85d4d8b240965e7b2aa95f737c35948649e36eb Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=b85d4d8b240965e7b2aa95f737c35948649e36eb commit b85d4d8b240965e7b2aa95f737c35948649e36eb Author: Jason E. Hale AuthorDate: 2025-02-05 06:31:08 +0000 Commit: Jason E. Hale CommitDate: 2025-02-05 06:42:22 +0000 audio/kid3: Remove kf5 flavor Since Plasma5 is gone and most KDE Applications have been switched to kf6, there is no more reason to keep the kf5 flavor. Refactor common variables. While here, fix warnings about locale settings in tests (again). --- MOVED | 1 + audio/kid3/Makefile | 49 +++++++++++++++---------------------------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/MOVED b/MOVED index 7ff0d6f7fde2..6ee4305a1942 100644 --- a/MOVED +++ b/MOVED @@ -4135,3 +4135,4 @@ devel/p5-Test-HTML-Tidy||2025-02-04|Has expired: Depends on expired textproc/p5- www/p5-CGI-Application-Plugin-HtmlTidy||2025-02-04|Has expired: Depends on expired textproc/p5-HTML-Tidy textproc/p5-HTML-Tidy||2025-02-04|Has expired: Depends on expired textproc/tidyp textproc/tidyp||2025-02-04|Has expired: The repository has been archived by upstream on Apr 14, 2019 +audio/kid3@kf5|audio/kid3@kf6|2025-02-05|kf5 support has been removed. Use kf6 flavor instead diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index fad024eafbd6..07e02ae3e321 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -14,57 +14,42 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl LIB_DEPENDS= libtag.so:audio/taglib -FLAVORS= qt6 kf5 kf6 +FLAVORS= qt6 kf6 FLAVOR?= ${FLAVORS:[1]} -USES= cmake compiler:c++17-lang desktop-file-utils gnome pkgconfig \ - tar:xz +USES= cmake compiler:c++17-lang desktop-file-utils gl gnome \ + pkgconfig qt:6 tar:xz +USE_GL= opengl USE_GNOME= libxslt:build USE_LDCONFIG= yes +USE_QT= base multimedia tools:build CMAKE_ARGS= -DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \ -DWITH_LIBDIR=lib \ -DWITH_MANDIR=share/man \ -DWITH_PLUGINSDIR=lib/kid3 \ -DFFMPEG_ROOT="${LOCALBASE}" \ - -DWITH_APPS="${KID3_APPS:S/ /;/gW}" + -DWITH_APPS="${_KID3_APPS:S/ /;/gW}" CMAKE_OFF= WITH_ID3LIB \ WITH_MP4V2 \ WITH_QML -CMAKE_ON= WITH_TAGLIB +CMAKE_ON= BUILD_WITH_QT6 \ + WITH_TAGLIB PLIST_SUB+= SHLIB_VER=${PORTVERSION} .if ${FLAVOR} == qt6 -USES+= gl qt:6 -USE_GL= opengl -USE_QT= base multimedia tools:build -CMAKE_ON+= BUILD_WITH_QT6 PLIST_SUB+= KF="@comment " \ QT="" \ QT_SUFX="-qt" -KID3_APPS+= QT -.elif ${FLAVOR} == kf5 -USES+= kde:5 qt:5 -USE_KDE= auth codecs config configwidgets coreaddons kio \ - service widgetsaddons xmlgui doctools:build ecm:build -USE_QT= concurrent core dbus gui multimedia network xml widgets \ - buildtools:build linguisttools:build qmake:build -CMAKE_OFF+= BUILD_WITH_QT6 -PLIST_SUB+= KF="" \ - QT="@comment " \ - QT_SUFX="" -KID3_APPS+= KDE +_KID3_APPS+= QT .elif ${FLAVOR} == kf6 -USES+= gl kde:6 qt:6 -USE_GL= opengl +USES+= kde:6 USE_KDE= colorscheme config configwidgets coreaddons kio \ widgetsaddons xmlgui doctools:build ecm:build -USE_QT= base multimedia tools:build -CMAKE_ON+= BUILD_WITH_QT6 PLIST_SUB+= KF="" \ QT="@comment " \ QT_SUFX="" -KID3_APPS+= KDE +_KID3_APPS+= KDE .endif .for f in ${FLAVORS} @@ -84,20 +69,16 @@ ACOUSTID_CMAKE_BOOL= WITH_CHROMAPRINT WITH_FFMPEG CLI_DESC= Build and install command line utility CLI_USES= python:test readline -CLI_VARS= KID3_APPS+=CLI +CLI_VARS= _KID3_APPS+=CLI FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_BOOL= WITH_FLAC FLAC_IMPLIES= VORBIS -TEST_USE= LOCALE=en_US.UTF-8 -.if ${FLAVOR} == kf5 -TEST_USE+= QT=testlib:build -.endif TEST_CMAKE_BOOL= BUILD_TESTING TEST_TARGET= # define to override CMAKE_ARGS from Uses/kde.mk TEST_WRKSRC= ${BUILD_WRKSRC}/src/test -TEST_VARS= KID3_APPS+=TEST +TEST_VARS= _KID3_APPS+=TEST VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg @@ -109,9 +90,9 @@ pre-test: @${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC} do-test: - -@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ./kid3-test) + -@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${TEST_ENV} ./kid3-test) do-test-CLI-on: - -@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py) + -@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py) .include