git: 3ba26f78de86 - main - sysutils/brasero: unbreak the build and packaging with non-default options
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 02 Dec 2021 10:59:03 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3ba26f78de864b0d9bbbb4f2874af3019cca5f17
commit 3ba26f78de864b0d9bbbb4f2874af3019cca5f17
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-12-02 10:58:00 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
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