Date: Thu, 19 Mar 2026 07:32:10 +0000 From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: db3fb95e08b3 - main - x11-wm/xfce4-panel-profiles: Fix python executable path, add missing dependency Message-ID: <69bba67a.3e21f.351242fa@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=db3fb95e08b373391dad8c92fb41d2a161ed3786 commit db3fb95e08b373391dad8c92fb41d2a161ed3786 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2026-03-19 07:30:41 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2026-03-19 07:32:05 +0000 x11-wm/xfce4-panel-profiles: Fix python executable path, add missing dependency - Fix python executable path, avoiding to embed WORKDIR path in command - Add RUN_DEPENDS on required python library While here: - Remove unneded patch, port now uses meson to build, so patching the Makefile is not needed PR: 293751 --- x11-wm/xfce4-panel-profiles/Makefile | 6 +++++- .../xfce4-panel-profiles/files/patch-Makefile.in.in | 21 --------------------- x11-wm/xfce4-panel-profiles/files/patch-meson.build | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/x11-wm/xfce4-panel-profiles/Makefile b/x11-wm/xfce4-panel-profiles/Makefile index d2803621d214..e1a853d79f87 100644 --- a/x11-wm/xfce4-panel-profiles/Makefile +++ b/x11-wm/xfce4-panel-profiles/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-panel-profiles PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -11,6 +12,7 @@ WWW= https://docs.xfce.org/apps/xfce4-panel-profiles/start LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=7.0.0:sysutils/py-psutil@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=7.0.0:sysutils/py-psutil@${PY_FLAVOR} USES= gettext-tools gnome meson pkgconfig python shebangfix tar:xz \ xfce @@ -19,7 +21,6 @@ USE_XFCE= libmenu panel SHEBANG_FILES= xfce4-panel-profiles/panelconfig.py \ xfce4-panel-profiles/xfce4-panel-profiles.py -BINARY_ALIAS= python3=${PYTHON_CMD} NO_ARCH= yes OPTIONS_DEFINE= DOCS NLS @@ -27,6 +28,9 @@ OPTIONS_SUB= yes NLS_USES= gettext-runtime +post-patch: + @${REINPLACE_CMD} -e "s/%%PYTHON_CMD%%/${PYTHON_VERSION}/g" ${WRKSRC}/meson.build + post-patch-NLS-off: @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build diff --git a/x11-wm/xfce4-panel-profiles/files/patch-Makefile.in.in b/x11-wm/xfce4-panel-profiles/files/patch-Makefile.in.in deleted file mode 100644 index ac33219faec5..000000000000 --- a/x11-wm/xfce4-panel-profiles/files/patch-Makefile.in.in +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.in.in.orig 2023-06-05 07:01:01 UTC -+++ Makefile.in.in -@@ -74,8 +74,6 @@ install: all xfce4-panel-profiles.1 - install -d $(DESTDIR)/$(PREFIX)/share/metainfo - install data/metainfo/*.xml $(DESTDIR)/$(PREFIX)/share/metainfo - -- cp -rf locale $(DESTDIR)/$(PREFIX)/share -- - install -d $(DESTDIR)/$(MANDIR)/man1 - install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 - -@@ -87,6 +85,9 @@ install: all xfce4-panel-profiles.1 - install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps - install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps - install data/icons/scalable/org.xfce.PanelProfiles.svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps -+ -+install-locale: install -+ cp -rf locale $(DESTDIR)/$(PREFIX)/share - - uninstall: - rm -f $(DESTDIR)/$(PREFIX)/share/applications/org.xfce.PanelProfiles.desktop diff --git a/x11-wm/xfce4-panel-profiles/files/patch-meson.build b/x11-wm/xfce4-panel-profiles/files/patch-meson.build new file mode 100644 index 000000000000..6bac0bc424e0 --- /dev/null +++ b/x11-wm/xfce4-panel-profiles/files/patch-meson.build @@ -0,0 +1,19 @@ +--- meson.build.orig 2025-05-22 06:53:32 UTC ++++ meson.build +@@ -11,14 +11,14 @@ if get_option('check-runtime-dependencies') + + python3_path = '' + if get_option('check-runtime-dependencies') +- python3 = python.find_installation('python3', modules: python3_required_modules) ++ python3 = python.find_installation('%%PYTHON_CMD%%', modules: python3_required_modules) + python3_path = python3.full_path() + endif + if get_option('python-path') != '' + python3_path = get_option('python-path') + endif + if python3_path == '' +- python3_path = 'python3' ++ python3_path = '%%PYTHON_CMD%%' + endif + + dependency_versions = {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bba67a.3e21f.351242fa>