diff options
Diffstat (limited to 'x11/plank')
-rw-r--r-- | x11/plank/Makefile | 25 | ||||
-rw-r--r-- | x11/plank/distinfo | 6 | ||||
-rw-r--r-- | x11/plank/files/patch-lib_Factories_ItemFactory.vala | 99 | ||||
-rw-r--r-- | x11/plank/files/patch-meson.build | 14 | ||||
-rw-r--r-- | x11/plank/pkg-plist | 6 |
5 files changed, 100 insertions, 50 deletions
diff --git a/x11/plank/Makefile b/x11/plank/Makefile index e5c759321aae..e15395c3de0e 100644 --- a/x11/plank/Makefile +++ b/x11/plank/Makefile @@ -1,5 +1,5 @@ PORTNAME= plank -DISTVERSION= 0.11.128 +DISTVERSION= 0.11.149 CATEGORIES= x11 MAINTAINER= daniel@shafer.cc @@ -14,32 +14,27 @@ LIB_DEPENDS= libbamf3.so:sysutils/bamf \ libgnome-menu-3.so:x11/gnome-menus RUN_DEPENDS= upower>0:sysutils/upower -USES= desktop-file-utils gettext-tools gnome localbase meson \ - pkgconfig vala:build xorg -USE_GNOME= glib20 gtk30 gdkpixbuf cairo libxml2 libwnck3 -USE_XORG= x11 xfixes xi - -CFLAGS+= -Wno-return-type -GLIB_SCHEMAS= net.launchpad.plank.gschema.xml - +USES= desktop-file-utils gettext-runtime gettext-tools gnome \ + meson pkgconfig vala:build xorg USE_GITHUB= yes GH_ACCOUNT= zquestz GH_PROJECT= plank-reloaded - -OPTIONS_SUB= yes - -OPTIONS_DEFINE= DBUSMENU -DBUSMENU_DESC= DBusMenu protocol +USE_GNOME= cairo gdkpixbuf glib20 gtk30 libwnck3 +GLIB_SCHEMAS= net.launchpad.plank.gschema.xml +USE_XORG= x11 xfixes xi MESON_ARGS= -Dproduction-release=true \ -Denable-apport=false \ -Denable-barriers=yes +OPTIONS_DEFINE= DBUSMENU +OPTIONS_SUB= yes +DBUSMENU_DESC= DBusMenu protocol DBUSMENU_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu DBUSMENU_MESON_YES= enable-dbusmenu post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|g' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/lib/Factories/ItemFactory.vala .include <bsd.port.mk> diff --git a/x11/plank/distinfo b/x11/plank/distinfo index 3ce955321297..0aa2e428ea3a 100644 --- a/x11/plank/distinfo +++ b/x11/plank/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748093572 -SHA256 (zquestz-plank-reloaded-0.11.128_GH0.tar.gz) = 8d4e8ef4bd97d68bf10dbec6bd2694d9b82fa35701827b3276a3360daa4d68e1 -SIZE (zquestz-plank-reloaded-0.11.128_GH0.tar.gz) = 648220 +TIMESTAMP = 1757420136 +SHA256 (zquestz-plank-reloaded-0.11.149_GH0.tar.gz) = 0526af75adde1b57fd583dcbc73be507c4f18e30104ca86be1a2d9aec3060e7e +SIZE (zquestz-plank-reloaded-0.11.149_GH0.tar.gz) = 665188 diff --git a/x11/plank/files/patch-lib_Factories_ItemFactory.vala b/x11/plank/files/patch-lib_Factories_ItemFactory.vala index 4e6214b71c3c..d28649a961ce 100644 --- a/x11/plank/files/patch-lib_Factories_ItemFactory.vala +++ b/x11/plank/files/patch-lib_Factories_ItemFactory.vala @@ -1,84 +1,111 @@ ---- lib/Factories/ItemFactory.vala.orig 2025-03-22 23:49:59 UTC +--- lib/Factories/ItemFactory.vala.orig 2025-08-28 03:55:28 UTC +++ lib/Factories/ItemFactory.vala -@@ -23,69 +23,49 @@ namespace Plank { +@@ -23,95 +23,67 @@ namespace Plank { */ public class ItemFactory : GLib.Object { const string[] DEFAULT_APP_WEB = { - "file:///usr/share/applications/brave-browser.desktop", - "file:///usr/share/applications/chromium-browser.desktop", - "file:///usr/share/applications/firefox.desktop", +- "file:///usr/share/applications/org.mozilla.firefox.desktop", +- "file:///var/lib/snapd/desktop/applications/firefox_firefox.desktop", - "file:///usr/share/applications/google-chrome.desktop", - "file:///usr/share/applications/epiphany.desktop", - "file:///usr/share/applications/midori.desktop", - "file:///usr/share/applications/kde4/konqbrowser.desktop" -+ "file://%%PREFIX%%/share/applications/chromium-browser.desktop", -+ "file://%%PREFIX%%/share/applications/firefox.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Epiphany.desktop" ++ "file://%%LOCALBASE%%/share/applications/chromium-browser.desktop", ++ "file://%%LOCALBASE%%/share/applications/firefox.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Epiphany.desktop", }; const string[] DEFAULT_APP_MAIL = { - "file:///usr/share/applications/org.mozilla.Thunderbird.desktop", - "file:///usr/share/applications/thunderbird.desktop", +- "file:///var/lib/snapd/desktop/applications/thunderbird_thunderbird.desktop", - "file:///usr/share/applications/evolution.desktop", +- "file:///usr/share/applications/org.gnome.Evolution.desktop", - "file:///usr/share/applications/geary.desktop", +- "file:///usr/share/applications/org.kde.kmail2.desktop", - "file:///usr/share/applications/kde4/KMail2.desktop" -+ "file://%%PREFIX%%/share/applications/thunderbird.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Evolution.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Geary.desktop", -+ "file://%%PREFIX%%/share/applications/org.kde.kmail2.desktop" ++ "file://%%LOCALBASE%%/share/applications/thunderbird.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Evolution.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Geary.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.kmail2.desktop", }; const string[] DEFAULT_APP_TERMINAL = { - "file:///usr/share/applications/com.mitchellh.ghostty.desktop", - "file:///usr/share/applications/kitty.desktop", - "file:///usr/share/applications/terminator.desktop", +- "file:///usr/share/applications/org.gnome.Terminal.desktop", - "file:///usr/share/applications/gnome-terminal.desktop", - "file:///usr/share/applications/pantheon-terminal.desktop", +- "file:///usr/share/applications/org.kde.konsole.desktop", +- "file:///usr/share/applications/xfce4-terminal.desktop", +- "file:///usr/share/applications/mate-terminal.desktop", - "file:///usr/share/applications/kde4/konsole.desktop", - "file:///usr/share/applications/xterm.desktop" -+ "file://%%PREFIX%%/share/applications/kitty.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Terminal.desktop", -+ "file://%%PREFIX%%/share/applications/io.elementary.terminal.desktop", -+ "file://%%PREFIX%%/share/applications/org.kde.konsole.desktop", -+ "file://%%PREFIX%%/share/applications/xterm.desktop" ++ "file://%%LOCALBASE%%/share/applications/kitty.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Terminal.desktop", ++ "file://%%LOCALBASE%%/share/applications/io.elementary.terminal.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.konsole.desktop", ++ "file://%%LOCALBASE%%/share/applications/xfce4-terminal.desktop", ++ "file://%%LOCALBASE%%/share/applications/mate-terminal.desktop", ++ "file://%%LOCALBASE%%/share/applications/xterm.desktop" }; const string[] DEFAULT_APP_AUDIO = { +- "file:///usr/share/applications/org.gnome.Rhythmbox3.desktop", - "file:///usr/share/applications/rhythmbox.desktop", - "file:///usr/share/applications/spotify.desktop", - "file:///usr/share/applications/exaile.desktop", - "file:///usr/share/applications/songbird.desktop", - "file:///usr/share/applications/noise.desktop", -- "file:///usr/share/applications/banshee-1.desktop", +- "file:///usr/share/applications/org.kde.elisa.desktop", - "file:///usr/share/applications/kde4/amarok.desktop" -+ "file://%%PREFIX%%/share/applications/org.gnome.Rhythmbox3.desktop", -+ "file://%%PREFIX%%/share/applications/exaile.desktop" ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Rhythmbox3.desktop", ++ "file://%%LOCALBASE%%/share/applications/exaile.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.elisa.desktop", }; const string[] DEFAULT_APP_VIDEO = { - "file:///usr/share/applications/vlc.desktop", - "file:///usr/share/applications/totem.desktop", +- "file:///usr/share/applications/mpv.desktop", - "file:///usr/share/applications/mplayer.desktop", - "file:///usr/share/applications/audience.desktop", -- "file:///usr/share/applications/kde4/amarok.desktop" -+ "file://%%PREFIX%%/share/applications/vlc.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Totem.desktop", -+ "file://%%PREFIX%%/share/applications/io.elementary.videos.desktop" +- "file:///usr/share/applications/org.xfce.Parole.desktop", +- "file:///usr/share/applications/io.github.celluloid_player.Celluloid.desktop", +- "file:///usr/share/applications/org.kde.dragonplayer.desktop" ++ "file://%%LOCALBASE%%/share/applications/vlc.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Totem.desktop", ++ "file://%%LOCALBASE%%/share/applications/mpv.desktop", ++ "file://%%LOCALBASE%%/share/applications/io.elementary.videos.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.xfce.Parole.desktop", ++ "file://%%LOCALBASE%%/share/applications/io.github.celluloid_player.Celluloid.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.dragonplayer.desktop" }; const string[] DEFAULT_APP_PHOTO = { - "file:///usr/share/applications/pix.desktop", - "file:///usr/share/applications/gimp.desktop", - "file:///usr/share/applications/eog.desktop", +- "file:///usr/share/applications/xviewer.desktop", +- "file:///usr/share/applications/eom.desktop", - "file:///usr/share/applications/gnome-photos.desktop", - "file:///usr/share/applications/org.gnome.Photos.desktop", - "file:///usr/share/applications/shotwell.desktop", +- "file:///usr/share/applications/org.gnome.Shotwell.desktop", +- "file:///usr/share/applications/org.kde.gwenview.desktop", - "file:///usr/share/applications/kde4/digikam.desktop" -+ "file://%%PREFIX%%/share/applications/gimp.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.eog.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Photos.desktop", -+ "file://%%PREFIX%%/share/applications/org.gnome.Shotwell.desktop", -+ "file://%%PREFIX%%/share/applications/org.kde.digikam.desktop" ++ "file://%%LOCALBASE%%/share/applications/gimp.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.eog.desktop", ++ "file://%%LOCALBASE%%/share/applications/xviewer.desktop", ++ "file://%%LOCALBASE%%/share/applications/eom.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Photos.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Shotwell.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.gwenview.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.digikam.desktop" }; const string[] DEFAULT_APP_MESSENGER = { @@ -89,9 +116,23 @@ - "file:///usr/share/applications/empathy.desktop", - "file:///usr/share/applications/birdie.desktop", - "file:///usr/share/applications/kde4/kopete.desktop" -+ "file://%%PREFIX%%/share/applications/signal-desktop.desktop", -+ "file://%%PREFIX%%/share/applications/pidgin.desktop", -+ "file://%%PREFIX%%/share/applications/org.telegram.desktop.desktop" ++ "file://%%LOCALBASE%%/share/applications/signal-desktop.desktop", ++ "file://%%LOCALBASE%%/share/applications/pidgin.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.telegram.desktop.desktop" + }; + + const string[] DEFAULT_APP_FILE_MANAGER = { +- "file:///usr/share/applications/nemo.desktop", +- "file:///usr/share/applications/thunar.desktop", +- "file:///usr/share/applications/caja.desktop", +- "file:///usr/share/applications/org.kde.dolphin.desktop", +- "file:///usr/share/applications/dolphin.desktop", +- "file:///usr/share/applications/org.gnome.Nautilus.desktop" ++ "file://%%LOCALBASE%%/share/applications/nemo.desktop", ++ "file://%%LOCALBASE%%/share/applications/thunar.desktop", ++ "file://%%LOCALBASE%%/share/applications/caja.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.kde.dolphin.desktop", ++ "file://%%LOCALBASE%%/share/applications/org.gnome.Nautilus.desktop" }; /** diff --git a/x11/plank/files/patch-meson.build b/x11/plank/files/patch-meson.build index 14a25ca69853..9344cd3d6780 100644 --- a/x11/plank/files/patch-meson.build +++ b/x11/plank/files/patch-meson.build @@ -1,4 +1,4 @@ ---- meson.build.orig 2025-02-28 03:58:18 UTC +--- meson.build.orig 2025-08-28 03:55:28 UTC +++ meson.build @@ -138,10 +138,8 @@ add_project_arguments( ) @@ -11,3 +11,15 @@ '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), '-DGMENU_I_KNOW_THIS_IS_UNSTABLE', +@@ -284,11 +282,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( diff --git a/x11/plank/pkg-plist b/x11/plank/pkg-plist index 796b3f82d756..2c75984fd62b 100644 --- a/x11/plank/pkg-plist +++ b/x11/plank/pkg-plist @@ -8,11 +8,12 @@ lib/plank/docklets/libdocklet-battery.so lib/plank/docklets/libdocklet-clippy.so lib/plank/docklets/libdocklet-clock.so lib/plank/docklets/libdocklet-desktop.so +lib/plank/docklets/libdocklet-notifications.so lib/plank/docklets/libdocklet-separator.so lib/plank/docklets/libdocklet-trash.so lib/plank/docklets/libdocklet-workspaces.so libdata/pkgconfig/plank.pc -share/applications/plank.desktop +share/applications/net.launchpad.plank.desktop share/icons/hicolor/128x128/apps/plank-reloaded.png share/icons/hicolor/16x16/apps/plank-reloaded.png share/icons/hicolor/22x22/apps/plank-reloaded.png @@ -53,6 +54,7 @@ share/locale/ja/LC_MESSAGES/plank-reloaded.mo share/locale/ka/LC_MESSAGES/plank-reloaded.mo share/locale/kab/LC_MESSAGES/plank-reloaded.mo share/locale/ko/LC_MESSAGES/plank-reloaded.mo +share/locale/ku/LC_MESSAGES/plank-reloaded.mo share/locale/lt/LC_MESSAGES/plank-reloaded.mo share/locale/lv/LC_MESSAGES/plank-reloaded.mo share/locale/ml/LC_MESSAGES/plank-reloaded.mo @@ -71,7 +73,7 @@ share/locale/sl/LC_MESSAGES/plank-reloaded.mo share/locale/sma/LC_MESSAGES/plank-reloaded.mo share/locale/sq/LC_MESSAGES/plank-reloaded.mo share/locale/sr/LC_MESSAGES/plank-reloaded.mo -share/locale/sr@latin/LC_MESSAGES/plank-reloaded.mo +share/locale/sr_CS/LC_MESSAGES/plank-reloaded.mo share/locale/sv/LC_MESSAGES/plank-reloaded.mo share/locale/szl/LC_MESSAGES/plank-reloaded.mo share/locale/ta/LC_MESSAGES/plank-reloaded.mo |