From nobody Thu Apr 10 21:32:39 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 4ZYY206qr6z5tYFV; Thu, 10 Apr 2025 21:32:40 +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 4ZYY20519bz3ntJ; Thu, 10 Apr 2025 21:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744320760; 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=aN2soRyHLFJo4uK1RMjGAiH5haaEC9tOWs23P4bsgmA=; b=bQ4/75kCw0Vx0gn214NK+dsVRnI1AbibdyWUI8CMkQPfDIbM3rqyfnOkYfhLkKDCwwoSgU Z2mjquZoMwrdWR9UKBa7A14NYXHXaNQC8XkAOsNWmXRnd/DL+6ZwNRYyob/lcE/rb58V5s 7Izfb4MjduzpIgL3wuiHbqDLHxvIQzG0vgdrfUGmAHTSq5wy2syGmzX8wj/sIp3tnh2YYR YH41ea58ciPyA7fpGQ0HCXEA6zLwK0mH3jbbBS2/sdtLfNuA9FCzqu0Ab2lua5fObL3Qu2 dYve6EMZv882902BNSd2jiqoz/JsJk9SsHF6HhapG1LG8mLkfHaJfq6X3cesPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744320760; a=rsa-sha256; cv=none; b=R2FhlccTwiq5PA7w+JPVHNsiTOi64AW6Copc+dEyeE/ykqvOWednhxq59fnOhvkGaM0YJM p0eP42kb5Oe9bfW2lQcp0ydJtivjNuvGywji6EPYh8oLRb8125m3lj3EJDqxCW9km3N3A5 NWRpdofmBSklUKRMzg/J7zWAnep/bZ7CvsWUYJOJRmjnPwI63tasVW+MEaSa0zzS32aF7k NumJYOipDej/SjUYWRgBXdBndEz07Sm7eEh9+x+liFtLRDL+xRdGQ8ueImgqiq4+goiyDe EC3xqNPBKy1E/3m97fIaiY+X9cQPnuYva9OYXeAPntQJLzE1tUy9pBoEoxsupQ== 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=1744320760; 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=aN2soRyHLFJo4uK1RMjGAiH5haaEC9tOWs23P4bsgmA=; b=UXzmoNFKwIMeOY01N3iqY+t9Un2iCvLL8oq6N7i9UIuBI2Kh8+epvgxpw1dpGM2u0XM1lM I7dpjos7Lyjus/rAVeGFrJIJG+W98zDhWqHeNOAmTH6fXhIdu3IT77uRJ2FTcT94LnNcOw XVoP9PbCBGF9zMbs4LJD/tYfW8RvLgdYVEAqzQMipiwoQViHV93qkxdaZNUs++mdyuBC+R ZP22d7T6ioCFh9SjbuOXIta6aqEL+QibQl3k+7a9eJ31psyO4fxlp7RP3TEHa9eFR7G2U9 b/+oEFXoQBP4naki0l3TcyDw2FSVCHOWg8XMOf71froIxCVpfSNQMlh9kk1Dug== 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 4ZYY204cGmz1JQs; Thu, 10 Apr 2025 21:32:40 +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 53ALWdjl002831; Thu, 10 Apr 2025 21:32:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ALWdfV002828; Thu, 10 Apr 2025 21:32:39 GMT (envelope-from git) Date: Thu, 10 Apr 2025 21:32:39 GMT Message-Id: <202504102132.53ALWdfV002828@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Max Brazhnikov Subject: git: 722b8631e155 - 2025Q2 - devel/appstream-qt: Unflavorize 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: makc X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q2 X-Git-Reftype: branch X-Git-Commit: 722b8631e1550712d5b6739cd7c8dba0ffbe3bed Auto-Submitted: auto-generated The branch 2025Q2 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=722b8631e1550712d5b6739cd7c8dba0ffbe3bed commit 722b8631e1550712d5b6739cd7c8dba0ffbe3bed Author: Max Brazhnikov AuthorDate: 2025-04-02 21:56:36 +0000 Commit: Max Brazhnikov CommitDate: 2025-04-10 21:17:26 +0000 devel/appstream-qt: Unflavorize Qt5 flavor is not used anymore. (cherry picked from commit e9141a13c86744269b51d7a10b612d253ec1a8f6) --- devel/appstream-qt/Makefile | 22 ++++------------ devel/appstream-qt/pkg-plist | 62 ++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 48 deletions(-) diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile index 0b66b5af9037..9ed5507b3bf3 100644 --- a/devel/appstream-qt/Makefile +++ b/devel/appstream-qt/Makefile @@ -1,26 +1,14 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= Qt${FLAVOR:S/qt//} +PORTREVISION= 1 +PKGNAMESUFFIX= Qt6 COMMENT?= Qt bindings to AppStream LIB_DEPENDS= libappstream.so:devel/appstream -FLAVORS= qt6 qt5 -FLAVOR?= qt6 +USES= qt:6 +USE_QT= base -USES= qt:${FLAVOR:S/qt//} - -_USE_QT_qt5= core buildtools:build qmake:build testlib:build -_USE_QT_qt6= base -USE_QT= ${_USE_QT_${FLAVOR}} - -_MESON_ARGS_qt5= -Dqt-versions='5' -_MESON_ARGS_qt6= -Dqt-versions='6' -MESON_ARGS= -Dqt=true ${_MESON_ARGS_${FLAVOR}} - -_QT_VER_SUFFIX_qt5= 5 -_QT_VER_SUFFIX_qt6= # -PLIST_SUB= QT_VER_SUFFIX=${_QT_VER_SUFFIX_${FLAVOR}} +MESON_ARGS= -Dqt=true -Dqt-versions='6' MASTERDIR= ${.CURDIR}/../appstream PLIST= ${.CURDIR}/pkg-plist diff --git a/devel/appstream-qt/pkg-plist b/devel/appstream-qt/pkg-plist index bb6c58921cb4..723554228ee3 100644 --- a/devel/appstream-qt/pkg-plist +++ b/devel/appstream-qt/pkg-plist @@ -1,31 +1,31 @@ -include/AppStreamQt%%QT_VER_SUFFIX%%/appstreamqt_export.h -include/AppStreamQt%%QT_VER_SUFFIX%%/branding.h -include/AppStreamQt%%QT_VER_SUFFIX%%/bundle.h -include/AppStreamQt%%QT_VER_SUFFIX%%/category.h -include/AppStreamQt%%QT_VER_SUFFIX%%/component-box.h -include/AppStreamQt%%QT_VER_SUFFIX%%/component.h -include/AppStreamQt%%QT_VER_SUFFIX%%/contentrating.h -include/AppStreamQt%%QT_VER_SUFFIX%%/developer.h -include/AppStreamQt%%QT_VER_SUFFIX%%/icon.h -include/AppStreamQt%%QT_VER_SUFFIX%%/image.h -include/AppStreamQt%%QT_VER_SUFFIX%%/launchable.h -include/AppStreamQt%%QT_VER_SUFFIX%%/metadata.h -include/AppStreamQt%%QT_VER_SUFFIX%%/pool.h -include/AppStreamQt%%QT_VER_SUFFIX%%/provided.h -include/AppStreamQt%%QT_VER_SUFFIX%%/relation-check-result.h -include/AppStreamQt%%QT_VER_SUFFIX%%/relation.h -include/AppStreamQt%%QT_VER_SUFFIX%%/release-list.h -include/AppStreamQt%%QT_VER_SUFFIX%%/release.h -include/AppStreamQt%%QT_VER_SUFFIX%%/screenshot.h -include/AppStreamQt%%QT_VER_SUFFIX%%/spdx.h -include/AppStreamQt%%QT_VER_SUFFIX%%/suggested.h -include/AppStreamQt%%QT_VER_SUFFIX%%/systeminfo.h -include/AppStreamQt%%QT_VER_SUFFIX%%/translation.h -include/AppStreamQt%%QT_VER_SUFFIX%%/utils.h -include/AppStreamQt%%QT_VER_SUFFIX%%/version.h -include/AppStreamQt%%QT_VER_SUFFIX%%/video.h -lib/cmake/AppStreamQt%%QT_VER_SUFFIX%%/AppStreamQt%%QT_VER_SUFFIX%%Config.cmake -lib/cmake/AppStreamQt%%QT_VER_SUFFIX%%/AppStreamQt%%QT_VER_SUFFIX%%ConfigVersion.cmake -lib/libAppStreamQt%%QT_VER_SUFFIX%%.so -lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.1.0.4 -lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.3 +include/AppStreamQt/appstreamqt_export.h +include/AppStreamQt/branding.h +include/AppStreamQt/bundle.h +include/AppStreamQt/category.h +include/AppStreamQt/component-box.h +include/AppStreamQt/component.h +include/AppStreamQt/contentrating.h +include/AppStreamQt/developer.h +include/AppStreamQt/icon.h +include/AppStreamQt/image.h +include/AppStreamQt/launchable.h +include/AppStreamQt/metadata.h +include/AppStreamQt/pool.h +include/AppStreamQt/provided.h +include/AppStreamQt/relation-check-result.h +include/AppStreamQt/relation.h +include/AppStreamQt/release-list.h +include/AppStreamQt/release.h +include/AppStreamQt/screenshot.h +include/AppStreamQt/spdx.h +include/AppStreamQt/suggested.h +include/AppStreamQt/systeminfo.h +include/AppStreamQt/translation.h +include/AppStreamQt/utils.h +include/AppStreamQt/version.h +include/AppStreamQt/video.h +lib/cmake/AppStreamQt/AppStreamQtConfig.cmake +lib/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake +lib/libAppStreamQt.so +lib/libAppStreamQt.so.1.0.4 +lib/libAppStreamQt.so.3