From nobody Mon Jan 15 20:18:08 2024 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 4TDNk90yqvz57V4W; Mon, 15 Jan 2024 20:18:09 +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 4TDNk90VWhz4jvr; Mon, 15 Jan 2024 20:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705349889; 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=tUctYOQv9sZCfBsUqGc4SIBIXgsoYBgW2dF/RZiW4GM=; b=ouMBZkOxvT800Mat5rEm4wAVcm5XvTvHY/nK8/LWULWUZss4nqNLzq9hX/v8J1b08jdxQo sCsK2b1cNqDu5qotVpYVxCEu0qQBQUfqxtxyalQ/2tdd4VIHvY2wlCxthIKQCLq47+2DEf YIrOh2z3Mkm35fJDFwDBysrFdNJTK28TDZUl+SCiqMjFIsdnxXszX9Rp5eryCUdUkH7blV spJ9lrjz3LJyPaczs9nC1Mol7O9BfTsqaZB2rKdugycqjG8l4EH8ul6Mz5xrYM9Gswt/b9 mXqBK0+K41b5upoba3ki4haywdeTrGAzm6p7yecNKjM9rp7z5e8346uZHpR4Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705349889; 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=tUctYOQv9sZCfBsUqGc4SIBIXgsoYBgW2dF/RZiW4GM=; b=nkYSqDX6Jvoyz68xRw23uQ6NFvX/EtDqh9RrArrUgHGiF+TyoMGwVCX6ioF7d1G2X6zrWZ zLiqM72Cx/KfHfJ+/F+dLkQgAbrWVFHkxGqj/Dwh01njyU1lB++38o5pFmyofsDHhovWco rzPBEr6JDfu9g8rMJppo4aOpCNO0Lxhn9eJu3rnW527XUuT7WPKv+5Hq2+QOtC9vBQKMKX aIjwRCm6q/YT1LgW/1e7Zp6x5FcFANoKT9IbBlVpiDDPH0uO2EB94fSuy35EX8eybfCfyB vDdaGcBOMYrnJc57Ose+xLrJe1T6efe+oaXemBnhRqY3pLiOtVVXlEPrAdYiFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705349889; a=rsa-sha256; cv=none; b=DqfUMJEXy2v2GCSggM6E+OnC+/zy7bEMG06x+jh+u8vknQtQDK+IL/eMwIGUTDTZ/zeX9O SjmPB5EVDGHFXs1ngTIZQeQRCSTh6PfWEJRP3F1wyOOp+EZiNOifXCVZTJS2Ub2fCXc7MH F6WOKGvqbG0iUcfsRWlMhJzORPtjqSLTQXjfup8oZ8ChRCM1y3EHMSPA5qeLEt/MHmTEIj gfTNo5opE1p+PiMEvNSH8f93JQ3WhEwhDhGcIzvqW6i05DMkcMaFSHphHY8KtG1sUAP112 QVChWaDwz5gzbrz4YSkyL9iYK3y1WrssGLgY5KuYp/6t9iTb/UPdbHdNLuA/RA== 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 4TDNk86jPKz18tx; Mon, 15 Jan 2024 20:18:08 +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 40FKI84h099700; Mon, 15 Jan 2024 20:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FKI8em099697; Mon, 15 Jan 2024 20:18:08 GMT (envelope-from git) Date: Mon, 15 Jan 2024 20:18:08 GMT Message-Id: <202401152018.40FKI8em099697@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: f292ea6fb5fc - main - devel/appstream{,-qt,-compose}: Combine into a single port with SUBPACKAGES. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f292ea6fb5fc10359f130a4e25a3b60ab0df7c6e Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f292ea6fb5fc10359f130a4e25a3b60ab0df7c6e commit f292ea6fb5fc10359f130a4e25a3b60ab0df7c6e Author: Gleb Popov AuthorDate: 2024-01-13 11:53:02 +0000 Commit: Gleb Popov CommitDate: 2024-01-15 20:17:34 +0000 devel/appstream{,-qt,-compose}: Combine into a single port with SUBPACKAGES. The Qt part was a bit complex as it had two FLAVORS. To work this out the slave devel/appstream-qt port wasn't removed but instead switched to build the master port without SUBPACKAGES and against Qt5 only. The Qt subpackage of the master port is fixed to Qt6 instead. This will make it possible to just remove Qt5 slave port when we get rid of Qt5 altogether. Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D43445 --- MOVED | 4 +-- devel/Makefile | 3 +-- devel/appstream-compose/Makefile | 24 ----------------- devel/appstream-compose/pkg-plist | 20 -------------- devel/appstream-qt/Makefile | 34 ------------------------ devel/appstream-qt/pkg-plist | 30 --------------------- devel/appstream-qt5/Makefile | 22 ++++++++++++++++ devel/appstream-qt5/pkg-plist | 30 +++++++++++++++++++++ devel/appstream/Makefile | 27 +++++++++++++++---- devel/appstream/pkg-descr.compose | 7 +++++ devel/appstream/pkg-descr.qt6 | 6 +++++ devel/appstream/pkg-plist | 53 +++++++++++++++++++++++++++++++++++++- sysutils/plasma5-discover/Makefile | 2 +- 13 files changed, 143 insertions(+), 119 deletions(-) diff --git a/MOVED b/MOVED index 13dbabe45e4e..48ea8b583bf2 100644 --- a/MOVED +++ b/MOVED @@ -2933,7 +2933,7 @@ net-im/libaccounts-qt5|net-im/libaccounts-qt|2024-01-05|Renamed to support flavo devel/py-pygithub|devel/py-PyGithub|2024-01-06|Rename port match upstream devel/freebsd-gcc9||2024-01-09|No longer able to build base system, use GCC 12 or later instead net/downzemall|net/arrowdl|2024-01-11|Project was renamed upstream -misc/mc-nox11|misc/mc|2024-01-15|No longer useful (misc/mc does not require Xlib at runtime) -www/mongrel2||2024-01-15|Has expired: BROKEN for more than 2 years on all platforms after the EOL of 12 net/unison232|net/unison240|2024-01-15|Has expired: More recent versions are in the tree consider using net/unison240 science/libtensorflow1||2024-01-15|Has expired: Broken for more than a year +devel/appstream-compose||2024-01-15|Became a subpackage of devel/appstream +devel/appstream-qt|devel/appstream-qt5|2024-01-15|The Qt6 flavor became a subpackage of devel/appstream diff --git a/devel/Makefile b/devel/Makefile index bbd9ecc63b8c..879de1d80cc3 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -182,9 +182,8 @@ SUBDIR += apitrace SUBDIR += app-builder SUBDIR += appstream - SUBDIR += appstream-compose SUBDIR += appstream-glib - SUBDIR += appstream-qt + SUBDIR += appstream-qt5 SUBDIR += apr1 SUBDIR += arachne-pnr SUBDIR += arcanist diff --git a/devel/appstream-compose/Makefile b/devel/appstream-compose/Makefile deleted file mode 100644 index decfcca607cd..000000000000 --- a/devel/appstream-compose/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= Compose - -COMMENT?= AppStream Compose application and library - -LIB_DEPENDS= libappstream.so:devel/appstream \ - libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libyaml.so:textproc/libyaml - -USE_GNOME= cairo gdkpixbuf2 librsvg2 pango - -MESON_ARGS= -Dcompose=true - -MASTERDIR= ${.CURDIR}/../../devel/appstream -PLIST= ${.CURDIR}/pkg-plist - -post-install: - # remove files belonging to the master port - ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% < ${MASTERDIR}/pkg-plist - ${FIND} ${STAGEDIR}${PREFIX} -empty -delete - ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/man - -.include "${MASTERDIR}/Makefile" diff --git a/devel/appstream-compose/pkg-plist b/devel/appstream-compose/pkg-plist deleted file mode 100644 index c94c3357cfd6..000000000000 --- a/devel/appstream-compose/pkg-plist +++ /dev/null @@ -1,20 +0,0 @@ -include/appstream-compose/appstream-compose.h -include/appstream-compose/asc-canvas.h -include/appstream-compose/asc-compose.h -include/appstream-compose/asc-directory-unit.h -include/appstream-compose/asc-enums-types.h -include/appstream-compose/asc-globals.h -include/appstream-compose/asc-hint.h -include/appstream-compose/asc-icon-policy.h -include/appstream-compose/asc-image.h -include/appstream-compose/asc-result.h -include/appstream-compose/asc-unit.h -include/appstream-compose/asc-utils.h -lib/girepository-1.0/AppStreamCompose-1.0.typelib -lib/libappstream-compose.so -lib/libappstream-compose.so.0 -lib/libappstream-compose.so.1.0.0 -libdata/pkgconfig/appstream-compose.pc -libexec/appstreamcli-compose -share/gir-1.0/AppStreamCompose-1.0.gir -share/metainfo/org.freedesktop.appstream.compose.metainfo.xml diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile deleted file mode 100644 index c1b13a1a9902..000000000000 --- a/devel/appstream-qt/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -PORTREVISION= 2 -PKGNAMESUFFIX= Qt${FLAVOR:S/qt//} - -COMMENT?= Qt bindings to AppStream - -LIB_DEPENDS= libappstream.so:devel/appstream - -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - -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= -Dqt5=true -_MESON_ARGS_qt6= -Dqt=true -MESON_ARGS= ${_MESON_ARGS_${FLAVOR}} - -_QT_VER_SUFFIX_qt5= 5 -_QT_VER_SUFFIX_qt6= # -PLIST_SUB= QT_VER_SUFFIX=${_QT_VER_SUFFIX_${FLAVOR}} - -MASTERDIR= ${.CURDIR}/../appstream -PLIST= ${.CURDIR}/pkg-plist - -post-install: - # remove files belonging to the master port - ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% < ${MASTERDIR}/pkg-plist - ${FIND} ${STAGEDIR}${PREFIX} -empty -delete - ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/man - -.include "${MASTERDIR}/Makefile" diff --git a/devel/appstream-qt/pkg-plist b/devel/appstream-qt/pkg-plist deleted file mode 100644 index aebf9b977979..000000000000 --- a/devel/appstream-qt/pkg-plist +++ /dev/null @@ -1,30 +0,0 @@ -include/AppStreamQt%%QT_VER_SUFFIX%%/appstreamqt_export.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.0 -lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.3 diff --git a/devel/appstream-qt5/Makefile b/devel/appstream-qt5/Makefile new file mode 100644 index 000000000000..b8d53b7448fd --- /dev/null +++ b/devel/appstream-qt5/Makefile @@ -0,0 +1,22 @@ +PORTREVISION= 3 +PKGNAMESUFFIX= -qt5 + +COMMENT= Qt5 bindings to AppStream + +SUBPACKAGES= + +LIB_DEPENDS= libappstream.so:devel/appstream + +QT_FLAVOR= 5 + +MASTERDIR= ${.CURDIR}/../appstream +PLIST= ${.CURDIR}/pkg-plist + +post-install: + # remove files belonging to the master port + ${SED} -e 's|@@compose@@||' -e 's|@@qt6@@||' ${MASTERDIR}/pkg-plist \ + | ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% + ${FIND} ${STAGEDIR}${PREFIX} -empty -delete + ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/share/man + +.include "${MASTERDIR}/Makefile" diff --git a/devel/appstream-qt5/pkg-plist b/devel/appstream-qt5/pkg-plist new file mode 100644 index 000000000000..351a20882ac7 --- /dev/null +++ b/devel/appstream-qt5/pkg-plist @@ -0,0 +1,30 @@ +include/AppStreamQt5/appstreamqt_export.h +include/AppStreamQt5/bundle.h +include/AppStreamQt5/category.h +include/AppStreamQt5/component-box.h +include/AppStreamQt5/component.h +include/AppStreamQt5/contentrating.h +include/AppStreamQt5/developer.h +include/AppStreamQt5/icon.h +include/AppStreamQt5/image.h +include/AppStreamQt5/launchable.h +include/AppStreamQt5/metadata.h +include/AppStreamQt5/pool.h +include/AppStreamQt5/provided.h +include/AppStreamQt5/relation-check-result.h +include/AppStreamQt5/relation.h +include/AppStreamQt5/release-list.h +include/AppStreamQt5/release.h +include/AppStreamQt5/screenshot.h +include/AppStreamQt5/spdx.h +include/AppStreamQt5/suggested.h +include/AppStreamQt5/systeminfo.h +include/AppStreamQt5/translation.h +include/AppStreamQt5/utils.h +include/AppStreamQt5/version.h +include/AppStreamQt5/video.h +lib/cmake/AppStreamQt5/AppStreamQt5Config.cmake +lib/cmake/AppStreamQt5/AppStreamQt5ConfigVersion.cmake +lib/libAppStreamQt5.so +lib/libAppStreamQt5.so.1.0.0 +lib/libAppStreamQt5.so.3 diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile index ecc5cc47f6e9..b68cf902ecfa 100644 --- a/devel/appstream/Makefile +++ b/devel/appstream/Makefile @@ -14,28 +14,45 @@ WWW= https://www.freedesktop.org/wiki/Distributions/AppStream/ LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi +SUBPACKAGES?= compose qt6 + BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ gperf>0:devel/gperf \ itstool:textproc/itstool \ lmdb>0:databases/lmdb LIB_DEPENDS?= libcurl.so:ftp/curl \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig \ libstemmer.so:textproc/snowballstemmer \ libxmlb.so:textproc/libxmlb \ libyaml.so:textproc/libyaml \ libzstd.so:archivers/zstd +SELF_DEPENDS.compose= main +SELF_DEPENDS.qt6= main -USES+= gettext gnome localbase:ldflags meson pkgconfig \ - python:build tar:xz vala:build +USES= gettext gnome localbase:ldflags meson pkgconfig \ + qt:${QT_FLAVOR} tar:xz python:build vala:build -USE_GNOME+= glib20 introspection:build libxml2 libxslt:build +USE_QT= ${_USE_QT_${QT_FLAVOR}} +USE_GNOME= cairo gdkpixbuf2 glib20 introspection:build librsvg2 libxml2 \ + libxslt:build pango USE_LDCONFIG= yes +QT_FLAVOR?= 6 +_USE_QT_5= core buildtools:build qmake:build testlib:build +_USE_QT_6= base + #CFLAGS+= -D__BSD_VISIBLE=1 -MESON_ARGS+= -Dstemming=true \ +MESON_ARGS+= -Dcompose=true \ + -Dstemming=true \ -Dvapi=true \ -Dapidocs=false \ -Dinstall-docs=false \ - -Dsystemd=false + -Dsystemd=false \ + ${_MESON_ARGS_qt${QT_FLAVOR}} + +_MESON_ARGS_qt5= -Dqt5=true +_MESON_ARGS_qt6= -Dqt=true post-patch: ${REINPLACE_CMD} \ diff --git a/devel/appstream/pkg-descr.compose b/devel/appstream/pkg-descr.compose new file mode 100644 index 000000000000..2238903f649c --- /dev/null +++ b/devel/appstream/pkg-descr.compose @@ -0,0 +1,7 @@ +AppStream is a collaborative effort for making machine-readable software +metadata easily available to programs that need it. It is part of the +Freedesktop ecosystem and provides a convenient way to retrieve information +about available software. + +AppStream-compose is a library and a frontend CLI tool to scan filesystem and +generate AppStream XML. diff --git a/devel/appstream/pkg-descr.qt6 b/devel/appstream/pkg-descr.qt6 new file mode 100644 index 000000000000..60d88e78041a --- /dev/null +++ b/devel/appstream/pkg-descr.qt6 @@ -0,0 +1,6 @@ +AppStream is a collaborative effort for making machine-readable software +metadata easily available to programs that need it. It is part of the +Freedesktop ecosystem and provides a convenient way to retrieve information +about available software. + +AppStreamQt provides a Qt-based C++ interface to the AppStream library. diff --git a/devel/appstream/pkg-plist b/devel/appstream/pkg-plist index 61b8ac8b8ed0..2ef510096845 100644 --- a/devel/appstream/pkg-plist +++ b/devel/appstream/pkg-plist @@ -1,4 +1,41 @@ bin/appstreamcli +@@qt6@@include/AppStreamQt/appstreamqt_export.h +@@qt6@@include/AppStreamQt/bundle.h +@@qt6@@include/AppStreamQt/category.h +@@qt6@@include/AppStreamQt/component-box.h +@@qt6@@include/AppStreamQt/component.h +@@qt6@@include/AppStreamQt/contentrating.h +@@qt6@@include/AppStreamQt/developer.h +@@qt6@@include/AppStreamQt/icon.h +@@qt6@@include/AppStreamQt/image.h +@@qt6@@include/AppStreamQt/launchable.h +@@qt6@@include/AppStreamQt/metadata.h +@@qt6@@include/AppStreamQt/pool.h +@@qt6@@include/AppStreamQt/provided.h +@@qt6@@include/AppStreamQt/relation-check-result.h +@@qt6@@include/AppStreamQt/relation.h +@@qt6@@include/AppStreamQt/release-list.h +@@qt6@@include/AppStreamQt/release.h +@@qt6@@include/AppStreamQt/screenshot.h +@@qt6@@include/AppStreamQt/spdx.h +@@qt6@@include/AppStreamQt/suggested.h +@@qt6@@include/AppStreamQt/systeminfo.h +@@qt6@@include/AppStreamQt/translation.h +@@qt6@@include/AppStreamQt/utils.h +@@qt6@@include/AppStreamQt/version.h +@@qt6@@include/AppStreamQt/video.h +@@compose@@include/appstream-compose/appstream-compose.h +@@compose@@include/appstream-compose/asc-canvas.h +@@compose@@include/appstream-compose/asc-compose.h +@@compose@@include/appstream-compose/asc-directory-unit.h +@@compose@@include/appstream-compose/asc-enums-types.h +@@compose@@include/appstream-compose/asc-globals.h +@@compose@@include/appstream-compose/asc-hint.h +@@compose@@include/appstream-compose/asc-icon-policy.h +@@compose@@include/appstream-compose/asc-image.h +@@compose@@include/appstream-compose/asc-result.h +@@compose@@include/appstream-compose/asc-unit.h +@@compose@@include/appstream-compose/asc-utils.h include/appstream/appstream.h include/appstream/as-agreement-section.h include/appstream/as-agreement.h @@ -39,16 +76,27 @@ include/appstream/as-validator.h include/appstream/as-vercmp.h include/appstream/as-version.h include/appstream/as-video.h +@@qt6@@lib/cmake/AppStreamQt/AppStreamQtConfig.cmake +@@qt6@@lib/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake lib/girepository-1.0/AppStream-1.0.typelib +@@compose@@lib/girepository-1.0/AppStreamCompose-1.0.typelib +@@qt6@@lib/libAppStreamQt.so +@@qt6@@lib/libAppStreamQt.so.1.0.0 +@@qt6@@lib/libAppStreamQt.so.3 +@@compose@@lib/libappstream-compose.so +@@compose@@lib/libappstream-compose.so.0 +@@compose@@lib/libappstream-compose.so.1.0.0 lib/libappstream.so lib/libappstream.so.1.0.0 lib/libappstream.so.5 +@@compose@@libdata/pkgconfig/appstream-compose.pc libdata/pkgconfig/appstream.pc -share/man/man1/appstreamcli.1.gz +@@compose@@libexec/appstreamcli-compose share/appstream/appstream.conf share/gettext/its/metainfo.its share/gettext/its/metainfo.loc share/gir-1.0/AppStream-1.0.gir +@@compose@@share/gir-1.0/AppStreamCompose-1.0.gir share/installed-tests/appstream/metainfo-validate.test share/locale/ain/LC_MESSAGES/appstream.mo share/locale/ar/LC_MESSAGES/appstream.mo @@ -96,6 +144,9 @@ share/locale/tr/LC_MESSAGES/appstream.mo share/locale/uk/LC_MESSAGES/appstream.mo share/locale/zh_CN/LC_MESSAGES/appstream.mo share/locale/zh_TW/LC_MESSAGES/appstream.mo +@@compose@@share/man/man1/appstreamcli-compose.1.gz +share/man/man1/appstreamcli.1.gz share/metainfo/org.freedesktop.appstream.cli.metainfo.xml +@@compose@@share/metainfo/org.freedesktop.appstream.compose.metainfo.xml share/vala/vapi/appstream.deps share/vala/vapi/appstream.vapi diff --git a/sysutils/plasma5-discover/Makefile b/sysutils/plasma5-discover/Makefile index 28141a51073a..73226af3b35f 100644 --- a/sysutils/plasma5-discover/Makefile +++ b/sysutils/plasma5-discover/Makefile @@ -9,7 +9,7 @@ WWW= https://www.kde.org/plasma-desktop # TODO: update packagekit-qt5 #LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt5 -LIB_DEPENDS= libAppStreamQt5.so:devel/appstream-qt@qt5 +LIB_DEPENDS= libAppStreamQt5.so:devel/appstream-qt5 USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 \ pkgconfig qt:5 tar:xz xorg