devel/appstream{,-qt,-compose}: Update to 1.0.0

Sponsored by:	Serenity Cybersecurity, LLC

devel/appstream-compose/Makefile

@@ -1,9 +1,12 @@
-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
 

devel/appstream-compose/pkg-plist

@@ -13,7 +13,7 @@ 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

devel/appstream-qt/Makefile

@@ -5,9 +5,9 @@ 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
 

devel/appstream-qt/pkg-plist

@@ -1,15 +1,19 @@
 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
@@ -22,5 +26,5 @@ 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

devel/appstream/Makefile

@@ -2,8 +2,8 @@
 # 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/
 
@@ -19,18 +19,18 @@ BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 		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 \
@@ -46,8 +46,5 @@ post-patch:
 	${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 <bsd.port.mk>

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

devel/appstream/files/patch-compose_asc-globals.c

@@ -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;

devel/appstream/files/patch-compose_asc-utils-l10n.c

@@ -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;
- 			}
- 		}

devel/appstream/files/patch-compose_meson.build

@@ -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)

devel/appstream/files/patch-data_meson.build

@@ -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')

devel/appstream/files/patch-src_meson.build

@@ -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)

devel/appstream/pkg-plist

@@ -1,29 +1,31 @@
 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
@@ -39,10 +41,11 @@ 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