Attachment #273806 for bug #297567




PORTNAME=	plank
DISTVERSION=	0.11.172
CATEGORIES=	x11

MAINTAINER=	ports@FreeBSD.org


LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
		libgee-0.8.so:devel/libgee \
		libgnome-menu-3.so:x11/gnome-menus \
		libcanberra.so:audio/libcanberra
RUN_DEPENDS=	upower>0:sysutils/upower

USES=		desktop-file-utils gnome \
		meson pkgconfig vala:build xorg
USE_GITHUB=	yes
GH_ACCOUNT=	zquestz

USE_GNOME=	cairo gdkpixbuf glib20 gtk30 libwnck3
GLIB_SCHEMAS=	net.launchpad.plank.gschema.xml
USE_XORG=	x11 xfixes xi
USE_LDCONFIG=	yes

MESON_ARGS=	-Dproduction-release=true \
		-Denable-apport=false \
		-Denable-dbusmenu=no \
		-Denable-barriers=yes

OPTIONS_DEFINE=	NLS
OPTIONS_SUB=	yes

NLS_USES=	gettext-runtime gettext-tools
NLS_CONFIGURE_OFF=	--disable-nls

post-patch:
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
		${WRKSRC}/docklets/Separator/SeparatorDockItem.vala \

Lines 1-3 Link Here

(-)b/x11/plank/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1776601204	1	TIMESTAMP = 1786844683
2	SHA256 (zquestz-plank-reloaded-0.11.167_GH0.tar.gz) = 7c24a46bff96eb86f1dfc820c843d78a14634077cbcbb3695b2cb1aad184c536	2	SHA256 (zquestz-plank-reloaded-0.11.172_GH0.tar.gz) = 11b5e56b838c1b7a0af443fe18c90001a33ed7412cee81abbbc730de6135fb1d
3	SIZE (zquestz-plank-reloaded-0.11.167_GH0.tar.gz) = 1503871	3	SIZE (zquestz-plank-reloaded-0.11.172_GH0.tar.gz) = 1539080




--- docklets/Battery/BatteryDocklet.vala.orig	2025-02-28 03:58:18 UTC
+++ docklets/Battery/BatteryDocklet.vala
@@ -35,9 +35,11 @@ namespace Docky {
     public bool is_supported () { return true; }
 
     public Plank.DockElement make_element (string launcher, GLib.File file) {
-      return (BatteryUPowerDockItem.is_supported)
-                ? (Plank.DockElement) new BatteryUPowerDockItem.with_dockitem_file (file)
-                : (Plank.DockElement) new BatteryDockItem.with_dockitem_file (file);
+      if (BatteryUPowerDockItem.is_supported) {
+        return (Plank.DockElement) new BatteryUPowerDockItem.with_dockitem_file (file);
+      }
+
+      return null;
     }
   }
 }

Removed Link Here

(-)a/x11/plank/files/patch-docklets_Battery_meson.build (-8 lines)
1	--- docklets/Battery/meson.build.orig 2025-02-28 03:58:18 UTC
2	+++ docklets/Battery/meson.build
3	@@ -1,5 +1,4 @@ docklet_battery_sources = [
4	docklet_battery_sources = [
5	- 'BatteryDockItem.vala',
6	'BatteryDocklet.vala',
7	'BatteryUPowerDockItem.vala',
8	]

Return to bug 297567

Lines 1-5 Link Here

(-)b/x11/plank/Makefile (-3 / +11 lines)
1	PORTNAME= plank	1	PORTNAME= plank
2	DISTVERSION= 0.11.167	2	DISTVERSION= 0.11.172
3	CATEGORIES= x11	3	CATEGORIES= x11
4		4
5	MAINTAINER= ports@FreeBSD.org	5	MAINTAINER= ports@FreeBSD.org
Lines 11-20 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
11		11
12	LIB_DEPENDS= libbamf3.so:sysutils/bamf \	12	LIB_DEPENDS= libbamf3.so:sysutils/bamf \
13	libgee-0.8.so:devel/libgee \	13	libgee-0.8.so:devel/libgee \
14	libgnome-menu-3.so:x11/gnome-menus	14	libgnome-menu-3.so:x11/gnome-menus \
		15	libcanberra.so:audio/libcanberra
15	RUN_DEPENDS= upower>0:sysutils/upower	16	RUN_DEPENDS= upower>0:sysutils/upower
16		17
17	USES= desktop-file-utils gettext-runtime gettext-tools gnome \	18	USES= desktop-file-utils gnome \
18	meson pkgconfig vala:build xorg	19	meson pkgconfig vala:build xorg
19	USE_GITHUB= yes	20	USE_GITHUB= yes
20	GH_ACCOUNT= zquestz	21	GH_ACCOUNT= zquestz
Lines 22-33 GH_PROJECT= plank-reloaded Link Here
22	USE_GNOME= cairo gdkpixbuf glib20 gtk30 libwnck3	23	USE_GNOME= cairo gdkpixbuf glib20 gtk30 libwnck3
23	GLIB_SCHEMAS= net.launchpad.plank.gschema.xml	24	GLIB_SCHEMAS= net.launchpad.plank.gschema.xml
24	USE_XORG= x11 xfixes xi	25	USE_XORG= x11 xfixes xi
		26	USE_LDCONFIG= yes
25		27
26	MESON_ARGS= -Dproduction-release=true \	28	MESON_ARGS= -Dproduction-release=true \
27	-Denable-apport=false \	29	-Denable-apport=false \
28	-Denable-dbusmenu=no \	30	-Denable-dbusmenu=no \
29	-Denable-barriers=yes	31	-Denable-barriers=yes
30		32
		33	OPTIONS_DEFINE= NLS
		34	OPTIONS_SUB= yes
		35
		36	NLS_USES= gettext-runtime gettext-tools
		37	NLS_CONFIGURE_OFF= --disable-nls
		38
31	post-patch:	39	post-patch:
32	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	40	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
33	${WRKSRC}/docklets/Separator/SeparatorDockItem.vala \	41	${WRKSRC}/docklets/Separator/SeparatorDockItem.vala \

Removed Link Here

(-)a/x11/plank/files/patch-docklets_Battery_BatteryDocklet.vala (-17 lines)
1	--- docklets/Battery/BatteryDocklet.vala.orig 2025-02-28 03:58:18 UTC
2	+++ docklets/Battery/BatteryDocklet.vala
3	@@ -35,9 +35,11 @@ namespace Docky {
4	public bool is_supported () { return true; }
5
6	public Plank.DockElement make_element (string launcher, GLib.File file) {
7	- return (BatteryUPowerDockItem.is_supported)
8	- ? (Plank.DockElement) new BatteryUPowerDockItem.with_dockitem_file (file)
9	- : (Plank.DockElement) new BatteryDockItem.with_dockitem_file (file);
10	+ if (BatteryUPowerDockItem.is_supported) {
11	+ return (Plank.DockElement) new BatteryUPowerDockItem.with_dockitem_file (file);
12	+ }
13	+
14	+ return null;
15	}
16	}
17	}