Date: Wed, 21 Feb 2024 14:28:05 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: dc4129270d51 - main - x11/wapanel: temporarily drop subpackages Message-ID: <202402211428.41LES58k017787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc4129270d51639363697395ff93892fc43896b0 commit dc4129270d51639363697395ff93892fc43896b0 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-02-20 20:21:14 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-02-21 14:27:21 +0000 x11/wapanel: temporarily drop subpackages https://github.com/freebsd/poudriere/issues/1113 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276845 Requested by: makc (kde), bdrewery (pkgmgr) Suggested by: pizzamig (portmgr) This reverts commit 4b4539c77959a64fc0f59e46b1112d4f76557ac2. --- x11/wapanel/Makefile | 6 ++---- x11/wapanel/pkg-descr.pulseaudio | 10 ---------- x11/wapanel/pkg-message | 9 --------- x11/wapanel/pkg-plist | 2 +- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/x11/wapanel/Makefile b/x11/wapanel/Makefile index 53d95271046a..f2c19c377815 100644 --- a/x11/wapanel/Makefile +++ b/x11/wapanel/Makefile @@ -1,6 +1,6 @@ PORTNAME= wapanel DISTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -27,9 +27,7 @@ OPTIONS_DEFINE= PULSEAUDIO OPTIONS_DEFAULT=PULSEAUDIO OPTIONS_SUB= yes -PULSEAUDIO_SUBPACKAGES= pulseaudio -LIB_DEPENDS.pulseaudio= libpulse.so:audio/pulseaudio -SELF_DEPENDS.pulseaudio=main +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_TRUE= volume-control post-patch: diff --git a/x11/wapanel/pkg-descr.pulseaudio b/x11/wapanel/pkg-descr.pulseaudio deleted file mode 100644 index 37fe3ddd4b26..000000000000 --- a/x11/wapanel/pkg-descr.pulseaudio +++ /dev/null @@ -1,10 +0,0 @@ -Simple panel/status bar/task bar for your custom stacking -Wayland-based desktop. - -Features: -- Good configurability -- Config hot reload -- Exposed API for writing custom applets -- Custom themes with CSS - -This package provides PulseAudio-based volume applet. diff --git a/x11/wapanel/pkg-message b/x11/wapanel/pkg-message deleted file mode 100644 index bd57b6bf6b1d..000000000000 --- a/x11/wapanel/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: upgrade - maximum_version: "1.1.0_4" - message: <<EOD -Applets with extra dependencies moved into subpackages: -- wapanel-pulseaudio -EOD -} -] diff --git a/x11/wapanel/pkg-plist b/x11/wapanel/pkg-plist index 7541c3c79123..e3057e9ef4da 100644 --- a/x11/wapanel/pkg-plist +++ b/x11/wapanel/pkg-plist @@ -6,7 +6,7 @@ lib/wapanel/applets/libwapanel-applet-app-finder.so lib/wapanel/applets/libwapanel-applet-clock.so lib/wapanel/applets/libwapanel-applet-separator.so lib/wapanel/applets/libwapanel-applet-task-switcher.so -%%PULSEAUDIO%%@@pulseaudio@@lib/wapanel/applets/libwapanel-applet-volume-control.so +%%PULSEAUDIO%%lib/wapanel/applets/libwapanel-applet-volume-control.so libdata/pkgconfig/wapanel-appletapi.pc %%DATADIR%%/3RD_PARTY_LICENSES %%DATADIR%%/icons/hicolor/scalable/actions/wapa-account.svg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402211428.41LES58k017787>