From nobody Mon Feb 20 15:15:33 2023 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 4PL5Zt0h9Xz3sx3S; Mon, 20 Feb 2023 15:15:34 +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 4PL5Zt0738z41dv; Mon, 20 Feb 2023 15:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676906134; 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=7XYQGsksrdRvkfBZ2iEqhsBJAlrZ2tJ/AjkmVS9UK24=; b=ocIslV/rRq1nE0aodBUewySKxQeC2VVNzKL1b7JyuiqKpdfIdLhCp7N3cnxD+ZIsh95bzE WbNeZ9mggdJwgyrDjbWR+8RQTKkUizZY5Zxel/aogmUi9T4N6KrKZg1qbzkOjyQeVDSOhd +yk3LoJZj7zozHy0TM0nBOqwVzrGZGXvrxy5n4wgy8E4qlxOp4N/OMbtgPl4o5MHQN4EOJ ZYf3mj1xHVJV85lxPORnBwuOQJWPZSsLneMN3/fy2AQPtQIuUTmtvq5JEuI4jh2eUoGlcU QqRYdvqZg7WvlLWhJk3rzVomcaXc4bxLIr5Jxsu31F7Neh2IEiSVXKlfGf1xfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676906134; 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=7XYQGsksrdRvkfBZ2iEqhsBJAlrZ2tJ/AjkmVS9UK24=; b=JMn1q/QqjoaN39zxYDGvH9S22X/UKcduaoE69FxiSXH3lGajWqS/Et5IFyB1qcIGaxqfpt feuGzDV5N67To9sSqEXYfsS+8B0OhGiGCKshyoaZ77zj0u6YC0dO5n1Bj/m+kRS4U3NtTI E8v2L74gVxn93K0fHiC9lZXREPCVtVWvWkCB/7aNqKdHmUGx2obWTkwdyErqBrPUc7N9w/ lpAj8CoTRqSYTMiOtpmmn0c1cTZ1yvvgOvNHMiZSkd40L/Ei0TmU1Fb41fbKdCHGkZna1i Wcnsk3wzqvgRl0NKex6y7qQgS0RvYSa1kh8p0e05wzfqPV09CqJrXZTBFuRf0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676906134; a=rsa-sha256; cv=none; b=GioRnLNXhfYLBBMBUIuLWmbvLdebfxE+R6L4mzUNjo3U2zNLNvsCD5AxdoHsYGHS3PnowU r+QqvbS0AjNvJ5O3MUfDEXPFJC2H0p1qq3P63o7IOtoBq0mCw1WCHVfE+Gg/bBmsNRS18P WPUreE6y6/5qNHD1v1tDoszNsE0o+8zVdMJwW+aHxGVXIGHQquwQw9GYrFwdc2gX9UYCuV DyX4Q36CoMj9DmIrdhhm2Q++CNQuXIU9ev41/htAzdqkOnCnplvZE0r9XvZWHaM8Aldrlv aDcI4mLAE0SLRTjbAnKrIHNgM31a+8CdhIgR0O+rvja9BBaj+Wdi2PZH7dKxXQ== 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 4PL5Zs6JFyzlgl; Mon, 20 Feb 2023 15:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KFFXO7063733; Mon, 20 Feb 2023 15:15:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KFFXMW063732; Mon, 20 Feb 2023 15:15:33 GMT (envelope-from git) Date: Mon, 20 Feb 2023 15:15:33 GMT Message-Id: <202302201515.31KFFXMW063732@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: aa7aa9418206 - main - devel/appstream-compose: + Generates AppStream XML files based on LOCALBASE contents. 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: aa7aa9418206216f97fbe133d6a87526e1f02938 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa7aa9418206216f97fbe133d6a87526e1f02938 commit aa7aa9418206216f97fbe133d6a87526e1f02938 Author: Gleb Popov AuthorDate: 2023-02-18 11:34:09 +0000 Commit: Gleb Popov CommitDate: 2023-02-20 15:15:24 +0000 devel/appstream-compose: + Generates AppStream XML files based on LOCALBASE contents. Sponsored by: Serenity Cybersecurity, LLC --- devel/Makefile | 1 + devel/appstream-compose/Makefile | 21 +++++++++++++++++++++ devel/appstream-compose/pkg-plist | 20 ++++++++++++++++++++ devel/appstream/Makefile | 2 +- devel/appstream/files/patch-compose_meson.build | 11 +++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/devel/Makefile b/devel/Makefile index b06a274d37ec..1478b7f9038f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -170,6 +170,7 @@ SUBDIR += apitrace SUBDIR += app-builder SUBDIR += appstream + SUBDIR += appstream-compose SUBDIR += appstream-glib SUBDIR += appstream-qt SUBDIR += apr1 diff --git a/devel/appstream-compose/Makefile b/devel/appstream-compose/Makefile new file mode 100644 index 000000000000..06b780de3734 --- /dev/null +++ b/devel/appstream-compose/Makefile @@ -0,0 +1,21 @@ +PORTREVISION= 0 +PKGNAMESUFFIX= Compose + +COMMENT?= AppStream Compose application and library + +LIB_DEPENDS= libappstream.so:devel/appstream + +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 new file mode 100644 index 000000000000..442967d66064 --- /dev/null +++ b/devel/appstream-compose/pkg-plist @@ -0,0 +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.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/Makefile b/devel/appstream/Makefile index b2107808fcd3..026b6693d5c4 100644 --- a/devel/appstream/Makefile +++ b/devel/appstream/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS?= libcurl.so:ftp/curl \ USES+= gettext gnome localbase:ldflags meson pkgconfig \ python:3.6+,build tar:xz vala:build -USE_GNOME= glib20 introspection:build libxml2 libxslt +USE_GNOME+= glib20 introspection:build libxml2 libxslt USE_LDCONFIG= yes CFLAGS+= -D__BSD_VISIBLE=1 diff --git a/devel/appstream/files/patch-compose_meson.build b/devel/appstream/files/patch-compose_meson.build new file mode 100644 index 000000000000..884872fcbf75 --- /dev/null +++ b/devel/appstream/files/patch-compose_meson.build @@ -0,0 +1,11 @@ +--- 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)