diff --git a/x11/plank/Makefile b/x11/plank/Makefile index 5e1b59783bc1..6fb7b1927e25 100644 --- a/x11/plank/Makefile +++ b/x11/plank/Makefile @@ -1,49 +1,52 @@ PORTNAME= plank -PORTVERSION= 0.11.89 -PORTREVISION= 5 +DISTVERSION= 0.11.100 CATEGORIES= x11 -MASTER_SITES= https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ MAINTAINER= daniel@shafer.cc COMMENT= Elegant, simple, and clean dock -WWW= https://launchpad.net/plank/ +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 -USES= gmake gnome libtool localbase pathfix pkgconfig tar:xz vala:build xorg -USE_GNOME= glib20 gtk30 gdkpixbuf2 cairo intlhack libxml2 libwnck3 dconf +USES= autoreconf gmake gnome libtool localbase pathfix pkgconfig \ + vala:build xorg +USE_GNOME= glib20 gtk30 gdkpixbuf2 cairo libxml2 libwnck3 USE_XORG= x11 xfixes xi CFLAGS+= -Wno-return-type GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share GLIB_SCHEMAS= net.launchpad.plank.gschema.xml +USE_GITHUB= yes +GH_ACCOUNT= zquestz +GH_PROJECT= plank-reloaded + OPTIONS_SUB= yes OPTIONS_DEFINE= NLS DBUSMENU DBUSMENU_DESC= DBusMenu protocol CONFIGURE_ARGS= --disable-benchmark \ --disable-headless-tests \ + --disable-docs \ --disable-apport NLS_USES= gettext NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls DBUSMENU_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu DBUSMENU_CONFIGURE_ENABLE= dbusmenu INSTALL_TARGET= install-strip post-patch: - ${REINPLACE_CMD} -e 's|CPUMonitor||' \ - ${WRKSRC}/docklets/Makefile.in + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|g' \ + ${WRKSRC}/lib/Factories/ItemFactory.vala .include diff --git a/x11/plank/distinfo b/x11/plank/distinfo index e9d5e698f231..cfa84b7fad6b 100644 --- a/x11/plank/distinfo +++ b/x11/plank/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570000003 -SHA256 (plank-0.11.89.tar.xz) = a662a46eaeffbd40661d1f36abd2589f7a98baef4b918876b872047b7ca59d9d -SIZE (plank-0.11.89.tar.xz) = 593940 +TIMESTAMP = 1737970024 +SHA256 (zquestz-plank-reloaded-0.11.100_GH0.tar.gz) = 689ccc74c54e08257a917393537ac569b09d68f1a1b35596aac0429dd4d3ed43 +SIZE (zquestz-plank-reloaded-0.11.100_GH0.tar.gz) = 375373 diff --git a/x11/plank/files/patch-docklets_Makefile.am b/x11/plank/files/patch-docklets_Makefile.am new file mode 100644 index 000000000000..a2b28491d447 --- /dev/null +++ b/x11/plank/files/patch-docklets_Makefile.am @@ -0,0 +1,12 @@ +--- docklets/Makefile.am.orig 2025-01-08 03:02:39 UTC ++++ docklets/Makefile.am +@@ -1,9 +1,7 @@ SUBDIRS = \ + SUBDIRS = \ + Applications \ +- Battery \ + Clippy \ + Clock \ +- CPUMonitor \ + Desktop \ + Trash \ + $(NULL) diff --git a/x11/plank/files/patch-lib_Factories_ItemFactory.vala b/x11/plank/files/patch-lib_Factories_ItemFactory.vala new file mode 100644 index 000000000000..36343004fae5 --- /dev/null +++ b/x11/plank/files/patch-lib_Factories_ItemFactory.vala @@ -0,0 +1,90 @@ +--- lib/Factories/ItemFactory.vala.orig 2025-01-08 03:02:39 UTC ++++ lib/Factories/ItemFactory.vala +@@ -25,64 +25,50 @@ namespace Plank + public class ItemFactory : GLib.Object + { + const string[] DEFAULT_APP_WEB = { +- "file:///usr/share/applications/chromium-browser.desktop", +- "file:///usr/share/applications/google-chrome.desktop", +- "file:///usr/share/applications/firefox.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" + }; + + const string[] DEFAULT_APP_MAIL = { +- "file:///usr/share/applications/thunderbird.desktop", +- "file:///usr/share/applications/evolution.desktop", +- "file:///usr/share/applications/geary.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" + }; + + const string[] DEFAULT_APP_CALENDAR = { +- "file:///usr/share/applications/thunderbird.desktop", +- "file:///usr/share/applications/evolution.desktop", +- "file:///usr/share/applications/maya-calendar.desktop", +- "file:///usr/share/applications/kde4/korganizer.desktop" ++ "file://%%PREFIX%%/share/applications/thunderbird.desktop", ++ "file://%%PREFIX%%/share/applications/org.gnome.Evolution.desktop", ++ "file://%%PREFIX%%/share/applications/org.kde.korganizer.desktop" + }; + + const string[] DEFAULT_APP_TERMINAL = { +- "file:///usr/share/applications/terminator.desktop", +- "file:///usr/share/applications/gnome-terminal.desktop", +- "file:///usr/share/applications/pantheon-terminal.desktop", +- "file:///usr/share/applications/kde4/konsole.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" + }; + + const string[] DEFAULT_APP_AUDIO = { +- "file:///usr/share/applications/exaile.desktop", +- "file:///usr/share/applications/songbird.desktop", +- "file:///usr/share/applications/rhythmbox.desktop", +- "file:///usr/share/applications/noise.desktop", +- "file:///usr/share/applications/banshee-1.desktop", +- "file:///usr/share/applications/kde4/amarok.desktop" ++ "file://%%PREFIX%%/share/applications/exaile.desktop", ++ "file://%%PREFIX%%/share/applications/org.gnome.Rhythmbox3.desktop" + }; + + const string[] DEFAULT_APP_VIDEO = { +- "file:///usr/share/applications/vlc.desktop", +- "file:///usr/share/applications/totem.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" + }; + + const string[] DEFAULT_APP_PHOTO = { +- "file:///usr/share/applications/eog.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/kde4/digikam.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" + }; + + const string[] DEFAULT_APP_MESSENGER = { +- "file:///usr/share/applications/pidgin.desktop", +- "file:///usr/share/applications/empathy.desktop", +- "file:///usr/share/applications/birdie.desktop", +- "file:///usr/share/applications/kde4/kopete.desktop" ++ "file://%%PREFIX%%/share/applications/pidgin.desktop" + }; + + /** diff --git a/x11/plank/files/patch-lib_Services_EnvironmentSettings.vala b/x11/plank/files/patch-lib_Services_EnvironmentSettings.vala new file mode 100644 index 000000000000..31b69fa0a88f --- /dev/null +++ b/x11/plank/files/patch-lib_Services_EnvironmentSettings.vala @@ -0,0 +1,11 @@ +--- lib/Services/EnvironmentSettings.vala.orig 2025-01-08 03:02:39 UTC ++++ lib/Services/EnvironmentSettings.vala +@@ -93,7 +93,7 @@ namespace Plank + public static unowned PantheonDesktopNotifications? try_get_instance () + { + if (instance == null) { +- var settings = try_create_settings ("org.pantheon.desktop.gala.notifications"); ++ var settings = try_create_settings ("io.elementary.notifications"); + if (settings != null && ("do-not-disturb" in settings.list_keys ())) + instance = (PantheonDesktopNotifications) Object.new (typeof (PantheonDesktopNotifications), + "settings", settings, "bind-flags", SettingsBindFlags.GET | SettingsBindFlags.INVERT_BOOLEAN, null); diff --git a/x11/plank/files/patch-lib__Makefile.in b/x11/plank/files/patch-lib__Makefile.in index 3e6557815563..7ea74deb3ada 100644 --- a/x11/plank/files/patch-lib__Makefile.in +++ b/x11/plank/files/patch-lib__Makefile.in @@ -1,10 +1,10 @@ ---- lib/Makefile.in.orig 2017-03-27 19:50:52 UTC -+++ lib/Makefile.in -@@ -767,7 +767,6 @@ noinst_LTLIBRARIES = libplank-internal.la +--- lib/Makefile.am.orig 2025-01-08 03:02:39 UTC ++++ lib/Makefile.am +@@ -148,7 +148,6 @@ libplank_internal_la_CFLAGS = \ libplank_internal_la_CFLAGS = \ $(AM_CFLAGS) \ -fPIC \ - -fvisibility=internal \ $(NULL) libplank_internal_la_LDFLAGS = \ diff --git a/x11/plank/pkg-plist b/x11/plank/pkg-plist index 05e3decb6494..57b8a9dcbfed 100644 --- a/x11/plank/pkg-plist +++ b/x11/plank/pkg-plist @@ -1,86 +1,89 @@ bin/plank include/plank/plank.h lib/libplank.so lib/libplank.so.1 lib/libplank.so.1.0.0 lib/plank/docklets/libdocklet-applications.so -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-trash.so libdata/pkgconfig/plank.pc share/man/man1/plank.1.gz share/metainfo/plank.appdata.xml share/applications/plank.desktop share/icons/hicolor/128x128/apps/plank.svg share/icons/hicolor/16x16/apps/plank.svg share/icons/hicolor/22x22/apps/plank.svg share/icons/hicolor/24x24/apps/plank.svg share/icons/hicolor/32x32/apps/plank.svg share/icons/hicolor/48x48/apps/plank.svg share/icons/hicolor/64x64/apps/plank.svg %%NLS%%share/locale/am/LC_MESSAGES/plank.mo %%NLS%%share/locale/ar/LC_MESSAGES/plank.mo +%%NLS%%share/locale/be/LC_MESSAGES/plank.mo %%NLS%%share/locale/bg/LC_MESSAGES/plank.mo %%NLS%%share/locale/bs/LC_MESSAGES/plank.mo %%NLS%%share/locale/ca/LC_MESSAGES/plank.mo +%%NLS%%share/locale/ckb/LC_MESSAGES/plank.mo %%NLS%%share/locale/cs/LC_MESSAGES/plank.mo %%NLS%%share/locale/da/LC_MESSAGES/plank.mo %%NLS%%share/locale/de/LC_MESSAGES/plank.mo %%NLS%%share/locale/el/LC_MESSAGES/plank.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/plank.mo %%NLS%%share/locale/en_CA/LC_MESSAGES/plank.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/plank.mo %%NLS%%share/locale/eo/LC_MESSAGES/plank.mo %%NLS%%share/locale/es/LC_MESSAGES/plank.mo %%NLS%%share/locale/et/LC_MESSAGES/plank.mo %%NLS%%share/locale/eu/LC_MESSAGES/plank.mo %%NLS%%share/locale/fi/LC_MESSAGES/plank.mo %%NLS%%share/locale/fr/LC_MESSAGES/plank.mo %%NLS%%share/locale/ga/LC_MESSAGES/plank.mo %%NLS%%share/locale/gd/LC_MESSAGES/plank.mo %%NLS%%share/locale/gl/LC_MESSAGES/plank.mo %%NLS%%share/locale/he/LC_MESSAGES/plank.mo %%NLS%%share/locale/hr/LC_MESSAGES/plank.mo %%NLS%%share/locale/hu/LC_MESSAGES/plank.mo %%NLS%%share/locale/id/LC_MESSAGES/plank.mo %%NLS%%share/locale/it/LC_MESSAGES/plank.mo %%NLS%%share/locale/ja/LC_MESSAGES/plank.mo %%NLS%%share/locale/ka/LC_MESSAGES/plank.mo +%%NLS%%share/locale/kab/LC_MESSAGES/plank.mo %%NLS%%share/locale/ko/LC_MESSAGES/plank.mo %%NLS%%share/locale/lt/LC_MESSAGES/plank.mo %%NLS%%share/locale/lv/LC_MESSAGES/plank.mo %%NLS%%share/locale/ml/LC_MESSAGES/plank.mo %%NLS%%share/locale/ms/LC_MESSAGES/plank.mo %%NLS%%share/locale/nb/LC_MESSAGES/plank.mo %%NLS%%share/locale/ne/LC_MESSAGES/plank.mo %%NLS%%share/locale/nl/LC_MESSAGES/plank.mo %%NLS%%share/locale/nn/LC_MESSAGES/plank.mo %%NLS%%share/locale/pl/LC_MESSAGES/plank.mo %%NLS%%share/locale/pt/LC_MESSAGES/plank.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/plank.mo %%NLS%%share/locale/ro/LC_MESSAGES/plank.mo %%NLS%%share/locale/ru/LC_MESSAGES/plank.mo %%NLS%%share/locale/sk/LC_MESSAGES/plank.mo %%NLS%%share/locale/sl/LC_MESSAGES/plank.mo %%NLS%%share/locale/sma/LC_MESSAGES/plank.mo %%NLS%%share/locale/sq/LC_MESSAGES/plank.mo %%NLS%%share/locale/sr/LC_MESSAGES/plank.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/plank.mo %%NLS%%share/locale/sv/LC_MESSAGES/plank.mo +%%NLS%%share/locale/szl/LC_MESSAGES/plank.mo %%NLS%%share/locale/ta/LC_MESSAGES/plank.mo %%NLS%%share/locale/te/LC_MESSAGES/plank.mo %%NLS%%share/locale/th/LC_MESSAGES/plank.mo %%NLS%%share/locale/tr/LC_MESSAGES/plank.mo %%NLS%%share/locale/uk/LC_MESSAGES/plank.mo %%NLS%%share/locale/uz/LC_MESSAGES/plank.mo %%NLS%%share/locale/vi/LC_MESSAGES/plank.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/plank.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/plank.mo %%DATADIR%%/themes/Default/dock.theme %%DATADIR%%/themes/Matte/dock.theme %%DATADIR%%/themes/Transparent/dock.theme share/vala/vapi/plank.deps share/vala/vapi/plank.vapi