diff options
Diffstat (limited to 'x11/plank/files')
-rw-r--r-- | x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala | 13 | ||||
-rw-r--r-- | x11/plank/files/patch-lib_Factories_ItemFactory.vala | 99 | ||||
-rw-r--r-- | x11/plank/files/patch-lib_Services_Environment.vala | 31 | ||||
-rw-r--r-- | x11/plank/files/patch-meson.build | 14 |
4 files changed, 127 insertions, 30 deletions
diff --git a/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala b/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala new file mode 100644 index 000000000000..bd347b8c77df --- /dev/null +++ b/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala @@ -0,0 +1,13 @@ +--- docklets/Separator/SeparatorDockItem.vala.orig 2025-09-17 00:18:24 UTC ++++ docklets/Separator/SeparatorDockItem.vala +@@ -252,8 +252,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-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-lib_Services_Environment.vala b/x11/plank/files/patch-lib_Services_Environment.vala new file mode 100644 index 000000000000..27722a36008f --- /dev/null +++ b/x11/plank/files/patch-lib_Services_Environment.vala @@ -0,0 +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 +@@ -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; + 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 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( |