From nobody Thu Dec 02 10:59:03 2021 X-Original-To: dev-commits-ports-main@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 4EA4F18B1BBE; Thu, 2 Dec 2021 10:59:04 +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 4J4XyH6pxPz3G3h; Thu, 2 Dec 2021 10:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CAC361C389; Thu, 2 Dec 2021 10:59:03 +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 1B2Ax3w4042084; Thu, 2 Dec 2021 10:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2Ax32Z042083; Thu, 2 Dec 2021 10:59:03 GMT (envelope-from git) Date: Thu, 2 Dec 2021 10:59:03 GMT Message-Id: <202112021059.1B2Ax32Z042083@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3ba26f78de86 - main - sysutils/brasero: unbreak the build and packaging with non-default options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ba26f78de864b0d9bbbb4f2874af3019cca5f17 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638442744; 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=ZnpfWG0GSYDrxK9mdonFdbjEjZX9gME8K+vd8qIgbvc=; b=mNARjGtLW8+LYpusZ8HVAte6KEOjGO0frwxhky/tofIX6x5exfsGmQCaE+I7CKZVc2ySwi h+bpnxvrRe7XKg1X3s+G4cT+Yh6wxXx76ElIUUCv7SZJvlAsup9yLhlZTIRu6XI5jXW77m zNUz8pJ6Ho+6/ecPmiBlrVlTY6TdM3noZ0RJ9spDXFGw8z/lqd4yo7jmOBQoGV/1j6nFxi 5/iggA66l84Q1IdBibh/6+WMnJ8N7OVh3T/b/Aq/fD07c3tmifkwFOlYihns6IroldSJxC pk3r/+4h3qkvihS3IydtHQlnQ/+IvVVbPB/JzLtojHXQadgKMIS0wonlTf269g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638442744; a=rsa-sha256; cv=none; b=YSVjVSAqmgzxU1fFLrHmeMEUNN/bHiFMd+ovO/343M+OTzLe+2rijeKKHOCViLaOpa+WMr QsTWyvgGV+Z4Z5sXuph6txa+eqYnE17qX+q93naXiBFBbCTJlWWLMrLrFE+s16SxfJ2Dh/ obubld4Xz6latgh/+655cgkPj3NT/HnZTIn7566fbRDYp9+B5dMhb+99YQlezVa7ruyHZv P2XaZN3Dgqv5dBMvYu/px9fP9yeUlt4uAvmzIUWQuJCXbKbp++C9PJ+WO3QitPkChVXKYd GiR/kuKdnLYmM5Qu5esfrDd+nG9g3GI8ttujgQHW4jhsosRxRjURnwSIYbff1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ba26f78de864b0d9bbbb4f2874af3019cca5f17 commit 3ba26f78de864b0d9bbbb4f2874af3019cca5f17 Author: Alexey Dokuchaev AuthorDate: 2021-12-02 10:58:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-12-02 10:58:00 +0000 sysutils/brasero: unbreak the build and packaging with non-default options Also add missing components to the USE_GNOME list as reported by stage Q/A. Fixes: 62b8d93762de --- sysutils/brasero/Makefile | 6 +++++- sysutils/brasero/pkg-plist | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 125125fea57d..0b90d4736d97 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -18,7 +18,8 @@ RUN_DEPENDS= growisofs:sysutils/dvd+rw-tools \ USES= desktop-file-utils gettext gmake gnome libtool pathfix \ pkgconfig shared-mime-info tar:xz xorg -USE_GNOME= gnomeprefix gtk30 intlhack libxml2 +USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 intlhack \ + introspection:build libxml2 GNU_CONFIGURE= yes USE_XORG= sm ice USE_LDCONFIG= yes @@ -34,10 +35,13 @@ GLIB_SCHEMAS= org.gnome.brasero.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= NAUTILUS LIBBURNIA OPTIONS_DEFAULT=NAUTILUS + NAUTILUS_DESC= Build nautilus extension LIBBURNIA_DESC= Build libburnia plug-ins + NAUTILUS_USE= GNOME=nautilus3 NAUTILUS_CONFIGURE_ENABLE= nautilus + LIBBURNIA_LIB_DEPENDS= libburn.so:devel/libburn \ libisofs.so:devel/libisofs LIBBURNIA_CONFIGURE_ENABLE= libburnia diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index cd81ca0a53e8..f00b0026fc34 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -42,6 +42,8 @@ lib/brasero3/plugins/libbrasero-dvdcss.so lib/brasero3/plugins/libbrasero-dvdrwformat.so lib/brasero3/plugins/libbrasero-genisoimage.so lib/brasero3/plugins/libbrasero-growisofs.so +%%LIBBURNIA%%lib/brasero3/plugins/libbrasero-libburn.so +%%LIBBURNIA%%lib/brasero3/plugins/libbrasero-libisofs.so lib/brasero3/plugins/libbrasero-local-track.so lib/brasero3/plugins/libbrasero-mkisofs.so lib/brasero3/plugins/libbrasero-normalize.so @@ -62,12 +64,12 @@ lib/libbrasero-media3.so.1.2.7 lib/libbrasero-utils3.so lib/libbrasero-utils3.so.1 lib/libbrasero-utils3.so.1.2.7 -lib/nautilus/extensions-3.0/libnautilus-brasero-extension.so +%%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-brasero-extension.so libdata/pkgconfig/libbrasero-burn3.pc libdata/pkgconfig/libbrasero-media3.pc man/man1/brasero.1.gz share/GConf/gsettings/brasero.convert -share/applications/brasero-nautilus.desktop +%%NAUTILUS%%share/applications/brasero-nautilus.desktop share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/16x16/actions/insert-pause.png %%DATADIR%%/icons/hicolor/16x16/actions/iso-image-burn.png