diff --git a/devel/appstream-compose/Makefile b/devel/appstream-compose/Makefile index 07d24c7568f4..decfcca607cd 100644 --- a/devel/appstream-compose/Makefile +++ b/devel/appstream-compose/Makefile @@ -1,21 +1,24 @@ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= Compose COMMENT?= AppStream Compose application and library -LIB_DEPENDS= libappstream.so:devel/appstream +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 index 4b2f62526b4d..c94c3357cfd6 100644 --- a/devel/appstream-compose/pkg-plist +++ b/devel/appstream-compose/pkg-plist @@ -1,20 +1,20 @@ 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.0.16.1 +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 index 0e787e767259..1703e990a599 100644 --- a/devel/appstream-qt/Makefile +++ b/devel/appstream-qt/Makefile @@ -1,23 +1,23 @@ PORTREVISION= 0 PKGNAMESUFFIX= Qt COMMENT?= Qt bindings to AppStream LIB_DEPENDS= libappstream.so:devel/appstream -USES= qt:5 +USES= qt:6 -USE_QT= core buildtools:build qmake:build testlib:build +USE_QT= base tools:build MESON_ARGS= -Dqt=true 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 index 4f7850aa9a50..98ad101dfe29 100644 --- a/devel/appstream-qt/pkg-plist +++ b/devel/appstream-qt/pkg-plist @@ -1,26 +1,30 @@ include/AppStreamQt/appstreamqt_export.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.0.16.1 -lib/libAppStreamQt.so.2 +lib/libAppStreamQt.so.1.0.0 +lib/libAppStreamQt.so.3 diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile index f4d7f4d47e87..aa3c9abb1502 100644 --- a/devel/appstream/Makefile +++ b/devel/appstream/Makefile @@ -1,53 +1,50 @@ # Some knobs are defined with ?= and += to allow them # being overriden by devel/appstream-qt slave port PORTNAME?= AppStream -DISTVERSION= 0.16.1 -PORTREVISION?= 1 +DISTVERSION= 1.0.0 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://www.freedesktop.org/software/${PORTNAME:tl}/releases/ MAINTAINER= desktop@FreeBSD.org COMMENT?= Machine-readable software metadata for desktop environments WWW= https://www.freedesktop.org/wiki/Distributions/AppStream/ LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi 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 \ - liblmdb.so:databases/lmdb \ libstemmer.so:textproc/snowballstemmer \ libxmlb.so:textproc/libxmlb \ - libyaml.so:textproc/libyaml + libyaml.so:textproc/libyaml \ + libzstd.so:archivers/zstd USES+= gettext gnome localbase:ldflags meson pkgconfig \ python:build tar:xz vala:build -USE_GNOME+= glib20 introspection:build libxml2 libxslt +USE_GNOME+= glib20 introspection:build libxml2 libxslt:build USE_LDCONFIG= yes -CFLAGS+= -D__BSD_VISIBLE=1 +#CFLAGS+= -D__BSD_VISIBLE=1 MESON_ARGS+= -Dstemming=true \ -Dvapi=true \ -Dapidocs=false \ -Dinstall-docs=false \ -Dsystemd=false post-patch: ${REINPLACE_CMD} \ -e 's|APPLICATIONS_DIR = "/usr/share/applications"|APPLICATIONS_DIR = "${LOCALBASE}/share/applications"|' \ -e 's|METAINFO_DIR = "/usr/share/metainfo"|METAINFO_DIR = "${LOCALBASE}/share/metainfo"|' \ -e 's|"/usr/share",|"${LOCALBASE}/share",|' \ ${WRKSRC}/src/as-pool.c ${REINPLACE_CMD} \ -e 's|"/usr/share";|"${LOCALBASE}/share";|' \ ${WRKSRC}/src/as-utils.c - ${REINPLACE_CMD} \ - -e 's|"/usr/share/fonts/"|"${LOCALBASE}/share/fonts/"|' \ - ${WRKSRC}/compose/asc-utils-fonts.c .include diff --git a/devel/appstream/distinfo b/devel/appstream/distinfo index 22e29849d54e..526c37bb04e2 100644 --- a/devel/appstream/distinfo +++ b/devel/appstream/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678435402 -SHA256 (AppStream-0.16.1.tar.xz) = 77e274e163db1f0a1bec8f4134b1d0f31e9c0a8c54cd37f724a7d30a71cf41d2 -SIZE (AppStream-0.16.1.tar.xz) = 2558188 +TIMESTAMP = 1700062305 +SHA256 (AppStream-1.0.0.tar.xz) = ef23477a380e8b525e92cfa87687f1146b9cef74c641349a1ae11250be5401d0 +SIZE (AppStream-1.0.0.tar.xz) = 2683916 diff --git a/devel/appstream/files/patch-compose_asc-globals.c b/devel/appstream/files/patch-compose_asc-globals.c deleted file mode 100644 index 1ce953ca1f47..000000000000 --- a/devel/appstream/files/patch-compose_asc-globals.c +++ /dev/null @@ -1,11 +0,0 @@ ---- compose/asc-globals.c.orig 2023-02-10 19:54:13 UTC -+++ compose/asc-globals.c -@@ -455,7 +455,7 @@ gchar** - * Returns: (transfer full): A list of valid hint tags. Free with %g_strfreev - */ - gchar** --asc_globals_get_hint_tags () -+asc_globals_get_hint_tags (void) - { - AscGlobalsPrivate *priv = asc_globals_get_priv (); - GHashTableIter iter; diff --git a/devel/appstream/files/patch-compose_asc-utils-l10n.c b/devel/appstream/files/patch-compose_asc-utils-l10n.c deleted file mode 100644 index 289b96b827f4..000000000000 --- a/devel/appstream/files/patch-compose_asc-utils-l10n.c +++ /dev/null @@ -1,15 +0,0 @@ ---- compose/asc-utils-l10n.c.orig 2023-02-10 19:54:13 UTC -+++ compose/asc-utils-l10n.c -@@ -390,11 +390,7 @@ asc_l10n_search_translations_qt (AscLocaleContext *ctx - locale = g_strdup (fname + strlen (qm_root) + 1); - g_strdelimit (locale, ".", '\0'); - tmp = g_strstr_len (locale, -1, "/"); -- if (tmp != NULL) { -- /* we have the ${hint}/${locale}.qm form */ -- locale = tmp + 1; -- } -- if (!asc_l10n_parse_file_qt (ctx, unit, locale, fname, error)) -+ if (!asc_l10n_parse_file_qt (ctx, unit, tmp == NULL ? locale : tmp + 1, fname, error)) - return FALSE; - } - } diff --git a/devel/appstream/files/patch-compose_meson.build b/devel/appstream/files/patch-compose_meson.build deleted file mode 100644 index 884872fcbf75..000000000000 --- a/devel/appstream/files/patch-compose_meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- compose/meson.build.orig 2023-01-26 21:56:35 UTC -+++ compose/meson.build -@@ -129,7 +129,7 @@ pc_fixup = run_command(sed_prog, - # builds using libappstream. Fix this issue by post-processing the file. - sed_prog = find_program('sed') - pc_fixup = run_command(sed_prog, -- '-i', -+ '-i.bak', - '/^Requires.private\|^Libs.private/ d', - join_paths(meson.project_build_root(), 'meson-private', 'appstream-compose.pc'), - check: false) diff --git a/devel/appstream/files/patch-data_meson.build b/devel/appstream/files/patch-data_meson.build deleted file mode 100644 index eec213898764..000000000000 --- a/devel/appstream/files/patch-data_meson.build +++ /dev/null @@ -1,10 +0,0 @@ ---- data/meson.build.orig 2022-02-22 16:53:59 UTC -+++ data/meson.build -@@ -68,6 +68,7 @@ test('as-validate_metainfo.cli', - ) - - install_data('appstream.conf', -+ rename: ['appstream.conf.sample'], - install_dir: get_option('sysconfdir')) - - if get_option('compose') diff --git a/devel/appstream/files/patch-src_meson.build b/devel/appstream/files/patch-src_meson.build deleted file mode 100644 index 6ca529fe1ded..000000000000 --- a/devel/appstream/files/patch-src_meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- src/meson.build.orig 2022-03-04 04:48:59 UTC -+++ src/meson.build -@@ -212,7 +212,7 @@ pkgc.generate( - # builds using libappstream. Fix this issue by post-processing the file. - sed_prog = find_program('sed') - pc_fixup = run_command(sed_prog, -- '-i', -+ '-i "" -e', - '/^Requires.private\|^Libs.private/ d', - join_paths(meson.project_build_root(), 'meson-private', 'appstream.pc'), - check: false) diff --git a/devel/appstream/pkg-plist b/devel/appstream/pkg-plist index ca88a8daa9c1..f7dfada0dbd9 100644 --- a/devel/appstream/pkg-plist +++ b/devel/appstream/pkg-plist @@ -1,98 +1,101 @@ bin/appstreamcli -@sample etc/appstream.conf.sample include/appstream/appstream.h include/appstream/as-agreement-section.h include/appstream/as-agreement.h include/appstream/as-artifact.h include/appstream/as-branding.h include/appstream/as-bundle.h -include/appstream/as-category-gir.h +include/appstream/as-category-gi.h include/appstream/as-category.h include/appstream/as-checksum.h +include/appstream/as-component-box.h include/appstream/as-component.h include/appstream/as-content-rating.h include/appstream/as-context.h -include/appstream/as-distro-details.h +include/appstream/as-developer.h include/appstream/as-enum-types.h -include/appstream/as-enums.h include/appstream/as-icon.h include/appstream/as-image.h include/appstream/as-issue.h include/appstream/as-launchable.h +include/appstream/as-macros.h include/appstream/as-metadata.h -include/appstream/as-pool-gir.h include/appstream/as-pool.h include/appstream/as-provided.h +include/appstream/as-reference.h +include/appstream/as-relation-check-result.h include/appstream/as-relation.h +include/appstream/as-release-list.h include/appstream/as-release.h include/appstream/as-review.h include/appstream/as-screenshot.h include/appstream/as-spdx.h include/appstream/as-suggested.h include/appstream/as-system-info.h include/appstream/as-translation.h include/appstream/as-utils.h include/appstream/as-validator-issue.h include/appstream/as-validator.h include/appstream/as-vercmp.h include/appstream/as-version.h include/appstream/as-video.h lib/girepository-1.0/AppStream-1.0.typelib lib/libappstream.so -lib/libappstream.so.0.16.1 -lib/libappstream.so.4 +lib/libappstream.so.1.0.0 +lib/libappstream.so.5 libdata/pkgconfig/appstream.pc man/man1/appstreamcli.1.gz +share/appstream/appstream.conf share/gettext/its/metainfo.its share/gettext/its/metainfo.loc share/gir-1.0/AppStream-1.0.gir share/installed-tests/appstream/metainfo-validate.test share/locale/ain/LC_MESSAGES/appstream.mo share/locale/ar/LC_MESSAGES/appstream.mo share/locale/bn/LC_MESSAGES/appstream.mo share/locale/bn_BD/LC_MESSAGES/appstream.mo share/locale/ca/LC_MESSAGES/appstream.mo share/locale/ckb/LC_MESSAGES/appstream.mo share/locale/cs/LC_MESSAGES/appstream.mo share/locale/da/LC_MESSAGES/appstream.mo share/locale/de/LC_MESSAGES/appstream.mo share/locale/en_GB/LC_MESSAGES/appstream.mo share/locale/eo/LC_MESSAGES/appstream.mo share/locale/es/LC_MESSAGES/appstream.mo share/locale/et/LC_MESSAGES/appstream.mo share/locale/eu/LC_MESSAGES/appstream.mo share/locale/fi/LC_MESSAGES/appstream.mo share/locale/fr/LC_MESSAGES/appstream.mo share/locale/gd/LC_MESSAGES/appstream.mo share/locale/gl/LC_MESSAGES/appstream.mo share/locale/he/LC_MESSAGES/appstream.mo share/locale/hi/LC_MESSAGES/appstream.mo share/locale/hr/LC_MESSAGES/appstream.mo share/locale/hu/LC_MESSAGES/appstream.mo share/locale/id/LC_MESSAGES/appstream.mo share/locale/it/LC_MESSAGES/appstream.mo share/locale/ja/LC_MESSAGES/appstream.mo share/locale/ka/LC_MESSAGES/appstream.mo share/locale/ko/LC_MESSAGES/appstream.mo share/locale/lt/LC_MESSAGES/appstream.mo share/locale/nb/LC_MESSAGES/appstream.mo share/locale/nl/LC_MESSAGES/appstream.mo share/locale/oc/LC_MESSAGES/appstream.mo share/locale/pl/LC_MESSAGES/appstream.mo share/locale/pt/LC_MESSAGES/appstream.mo share/locale/pt_BR/LC_MESSAGES/appstream.mo share/locale/ro/LC_MESSAGES/appstream.mo share/locale/rom/LC_MESSAGES/appstream.mo share/locale/ru/LC_MESSAGES/appstream.mo share/locale/sk/LC_MESSAGES/appstream.mo share/locale/sl/LC_MESSAGES/appstream.mo share/locale/sr/LC_MESSAGES/appstream.mo share/locale/sr@latin/LC_MESSAGES/appstream.mo share/locale/sv/LC_MESSAGES/appstream.mo 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 share/metainfo/org.freedesktop.appstream.cli.metainfo.xml share/vala/vapi/appstream.deps share/vala/vapi/appstream.vapi