diff --git a/x11/plank/Makefile b/x11/plank/Makefile index 7bc1a9d9b878..456a8607d958 100644 --- a/x11/plank/Makefile +++ b/x11/plank/Makefile @@ -1,36 +1,38 @@ PORTNAME= plank -DISTVERSION= 0.11.167 +DISTVERSION= 0.11.172 CATEGORIES= x11 MAINTAINER= ports@FreeBSD.org COMMENT= Elegant, simple, and clean dock WWW= https://github.com/zquestz/plank-reloaded LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libbamf3.so:sysutils/bamf \ libgee-0.8.so:devel/libgee \ - libgnome-menu-3.so:x11/gnome-menus + libgnome-menu-3.so:x11/gnome-menus \ + libcanberra.so:audio/libcanberra RUN_DEPENDS= upower>0:sysutils/upower USES= desktop-file-utils gettext-runtime gettext-tools gnome \ meson pkgconfig vala:build xorg USE_GITHUB= yes GH_ACCOUNT= zquestz GH_PROJECT= plank-reloaded USE_GNOME= cairo gdkpixbuf glib20 gtk30 libwnck3 GLIB_SCHEMAS= net.launchpad.plank.gschema.xml +USE_LDCONFIG= yes USE_XORG= x11 xfixes xi MESON_ARGS= -Dproduction-release=true \ -Denable-apport=false \ -Denable-dbusmenu=no \ -Denable-barriers=yes post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/docklets/Separator/SeparatorDockItem.vala \ ${WRKSRC}/lib/Factories/ItemFactory.vala .include diff --git a/x11/plank/distinfo b/x11/plank/distinfo index 5e4742864022..780928951d0a 100644 --- a/x11/plank/distinfo +++ b/x11/plank/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1776601204 -SHA256 (zquestz-plank-reloaded-0.11.167_GH0.tar.gz) = 7c24a46bff96eb86f1dfc820c843d78a14634077cbcbb3695b2cb1aad184c536 -SIZE (zquestz-plank-reloaded-0.11.167_GH0.tar.gz) = 1503871 +TIMESTAMP = 1786844683 +SHA256 (zquestz-plank-reloaded-0.11.172_GH0.tar.gz) = 11b5e56b838c1b7a0af443fe18c90001a33ed7412cee81abbbc730de6135fb1d +SIZE (zquestz-plank-reloaded-0.11.172_GH0.tar.gz) = 1539080 diff --git a/x11/plank/files/patch-docklets_Battery_BatteryDocklet.vala b/x11/plank/files/patch-docklets_Battery_BatteryDocklet.vala index 7af0ce3a9030..2ee7c049bb3b 100644 --- a/x11/plank/files/patch-docklets_Battery_BatteryDocklet.vala +++ b/x11/plank/files/patch-docklets_Battery_BatteryDocklet.vala @@ -1,17 +1,11 @@ ---- docklets/Battery/BatteryDocklet.vala.orig 2025-02-28 03:58:18 UTC +--- docklets/Battery/BatteryDocklet.vala.orig 2026-08-04 01:49:12 UTC +++ docklets/Battery/BatteryDocklet.vala -@@ -35,9 +35,11 @@ namespace Docky { +@@ -35,7 +35,7 @@ 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; +- return new BatteryUPowerDockItem.with_dockitem_file (file); ++ return (Plank.DockElement) new BatteryUPowerDockItem.with_dockitem_file (file); } } } diff --git a/x11/plank/files/patch-docklets_Battery_BatteryUPowerDockItem.vala b/x11/plank/files/patch-docklets_Battery_BatteryUPowerDockItem.vala new file mode 100644 index 000000000000..003ec6dbdb1b --- /dev/null +++ b/x11/plank/files/patch-docklets_Battery_BatteryUPowerDockItem.vala @@ -0,0 +1,14 @@ +--- docklets/Battery/BatteryUPowerDockItem.vala.orig 2026-08-04 01:49:12 UTC ++++ docklets/Battery/BatteryUPowerDockItem.vala +@@ -222,11 +222,6 @@ namespace Docky { + return false; + } + +- var replacement = new BatteryDockItem.with_dockitem_file(backing_file); +- if (container.replace(replacement, this)) { +- fallback_pending = false; +- } +- + return false; + }); + } diff --git a/x11/plank/files/patch-docklets_Battery_meson.build b/x11/plank/files/patch-docklets_Battery_meson.build index ad27ba8d3632..9bf5db35f52c 100644 --- a/x11/plank/files/patch-docklets_Battery_meson.build +++ b/x11/plank/files/patch-docklets_Battery_meson.build @@ -1,8 +1,8 @@ ---- docklets/Battery/meson.build.orig 2025-02-28 03:58:18 UTC +--- docklets/Battery/meson.build.orig 2026-08-04 01:49:12 UTC +++ docklets/Battery/meson.build @@ -1,5 +1,4 @@ docklet_battery_sources = [ docklet_battery_sources = [ - 'BatteryDockItem.vala', 'BatteryDocklet.vala', 'BatteryUPowerDockItem.vala', - ] + 'BatteryPreferences.vala', diff --git a/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala b/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala index bd347b8c77df..3be709a222fc 100644 --- a/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala +++ b/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala @@ -1,13 +1,13 @@ ---- docklets/Separator/SeparatorDockItem.vala.orig 2025-09-17 00:18:24 UTC +--- docklets/Separator/SeparatorDockItem.vala.orig 2026-08-04 01:49:12 UTC +++ docklets/Separator/SeparatorDockItem.vala -@@ -252,8 +252,8 @@ namespace Docky { +@@ -289,8 +289,8 @@ namespace Docky { ); string[] icon_paths = { - "/usr/share/icons", - "/usr/share/pixmaps", + "%%LOCALBASE%%/share/icons", + "%%LOCALBASE%%/share/pixmaps", GLib.Environment.get_home_dir () + "/.local/share/icons" }; diff --git a/x11/plank/files/patch-docklets_meson.build b/x11/plank/files/patch-docklets_meson.build index 3b8a3029024b..bfbbcd160a86 100644 --- a/x11/plank/files/patch-docklets_meson.build +++ b/x11/plank/files/patch-docklets_meson.build @@ -1,9 +1,10 @@ ---- docklets/meson.build.orig 2025-02-28 03:58:18 UTC +--- docklets/meson.build.orig 2026-08-04 01:49:12 UTC +++ docklets/meson.build -@@ -2,6 +2,5 @@ subdir('Clock') +@@ -2,7 +2,6 @@ subdir('Clock') subdir('Battery') subdir('Clippy') subdir('Clock') -subdir('CPUMonitor') subdir('Desktop') + subdir('Notifications') subdir('Trash') diff --git a/x11/plank/files/patch-lib_Services_Environment.vala b/x11/plank/files/patch-lib_Services_Environment.vala index 27722a36008f..633ba42b0e64 100644 --- a/x11/plank/files/patch-lib_Services_Environment.vala +++ b/x11/plank/files/patch-lib_Services_Environment.vala @@ -1,31 +1,31 @@ Add support for x11/budgie and fix x11/gnome-flashback, x11/gnome-shell-extensions ---- lib/Services/Environment.vala.orig 2025-09-17 00:18:24 UTC +--- lib/Services/Environment.vala.orig 2026-08-04 01:49:12 UTC +++ lib/Services/Environment.vala @@ -56,6 +56,7 @@ namespace Plank { PANTHEON = 1 << 11, DDE = 1 << 12, ENDLESS = 1 << 13, + BUDGIE = 1 << 14, OLD = 1 << 24, UBUNTU = 1 << 25; @@ -66,7 +67,8 @@ namespace Plank { case "gnome": result = XdgSessionDesktop.GNOME; break; case "gnome-xorg": result = XdgSessionDesktop.GNOME; break; case "gnome-classic": result = XdgSessionDesktop.GNOME; break; - case "gnome-flashback": result = XdgSessionDesktop.GNOME; break; + case "gnome-classic-xorg": result = XdgSessionDesktop.GNOME; break; + case "gnome-flashback-metacity": result = XdgSessionDesktop.GNOME; break; case "ubuntu": result = XdgSessionDesktop.UBUNTU; break; case "ubuntu-xorg": result = XdgSessionDesktop.UBUNTU; break; case "kde": result = XdgSessionDesktop.KDE; break; -@@ -83,6 +85,7 @@ namespace Plank { - case "cinnamon": result = XdgSessionDesktop.CINNAMON; break; +@@ -84,6 +86,7 @@ namespace Plank { + case "x-cinnamon": result = XdgSessionDesktop.CINNAMON; break; case "pantheon": result = XdgSessionDesktop.PANTHEON; break; case "dde": result = XdgSessionDesktop.DDE; break; + case "budgie": result = XdgSessionDesktop.BUDGIE; break; case "endless": result = XdgSessionDesktop.ENDLESS; break; case "old": result = XdgSessionDesktop.OLD; break; default: result = XdgSessionDesktop.UNKNOWN; break; diff --git a/x11/plank/files/patch-meson.build b/x11/plank/files/patch-meson.build index 9344cd3d6780..2fdf210d25b1 100644 --- a/x11/plank/files/patch-meson.build +++ b/x11/plank/files/patch-meson.build @@ -1,25 +1,25 @@ ---- meson.build.orig 2025-08-28 03:55:28 UTC +--- meson.build.orig 2026-08-04 01:49:12 UTC +++ meson.build @@ -138,10 +138,8 @@ add_project_arguments( ) add_project_arguments( [ - '-Wno-discarded-qualifiers', '-Wno-incompatible-pointer-types', '-Wno-unused', - '-Wl,--enable-new-dtags', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), '-DGMENU_I_KNOW_THIS_IS_UNSTABLE', -@@ -284,11 +282,6 @@ endif +@@ -307,11 +305,6 @@ endif ], ) endif - -install_data( - 'README.md', - install_dir: join_paths(get_option('datadir'), 'doc', 'plank-reloaded'), -) # Dist script to include additional files meson.add_dist_script(