git: 07071de288ab - main - deskutils/cairo-dock-plugins: Update to 3.5.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Sat, 04 Jan 2025 23:01:11 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=07071de288ab28e642800353e6ad5f2ef3ee5012

commit 07071de288ab28e642800353e6ad5f2ef3ee5012
Author:     Yusuf Yaman <nxjoseph@protonmail.com>
AuthorDate: 2025-01-04 22:56:20 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-01-04 23:00:30 +0000

    deskutils/cairo-dock-plugins: Update to 3.5.1
    
    - Submitter becomes maintainer
    
    Added a patch fix for Dbus plugin from upstream.
    
    See also:
    https://github.com/Cairo-Dock/cairo-dock-plug-ins/commit/965e01073943aa4adb84e0fdd86cf57a5a9ae935
    https://github.com/Cairo-Dock/cairo-dock-plug-ins/issues/31
    
    ChangeLog:
    https://github.com/Cairo-Dock/cairo-dock-plug-ins/releases/tag/3.5.1
    
    PR:             283821
---
 deskutils/cairo-dock-plugins/Makefile              | 35 ++++++++++------------
 deskutils/cairo-dock-plugins/distinfo              |  6 ++--
 .../cairo-dock-plugins/files/patch-CMakeLists.txt  | 22 --------------
 .../files/patch-Dbus_src_CMakeLists.txt            | 11 +++++++
 deskutils/cairo-dock-plugins/pkg-plist             | 34 +++++++++++++--------
 5 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 9cf466eec7e4..976c414fd614 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	cairo-dock-plugins
-DISTVERSION=	3.5.0
-PORTREVISION=	1
+DISTVERSION=	3.5.1
 CATEGORIES=	deskutils
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nxjoseph@protonmail.com
 COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
 WWW=		https://www.glx-dock.org/
 
@@ -13,8 +12,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
+		libdbusmenu-glib.so:devel/libdbusmenu \
+		libdbusmenu-gtk3.so:devel/libdbusmenu \
 		libgldi.so:deskutils/cairo-dock \
 		libharfbuzz.so:print/harfbuzz \
+		libvte-2.91.so:x11-toolkits/vte3 \
 		libwayland-client.so:graphics/wayland
 RUN_DEPENDS=	wget:ftp/wget
 
@@ -24,8 +26,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Cairo-Dock
 GH_PROJECT=	cairo-dock-plug-ins
 USE_GL=		gl glu opengl
-USE_GNOME=	cairo glib20 gtk30 librsvg2 libxml2
-USE_LDCONFIG=	yes
+USE_GNOME=	cairo glib20 gtk30 librsvg2 libxml2 vte3
 USE_XORG=	x11 xcomposite xrandr xrender xtst
 
 CMAKE_ARGS=	-Denable-mono-interface:BOOL=FALSE \
@@ -37,8 +38,6 @@ CMAKE_ARGS=	-Denable-mono-interface:BOOL=FALSE \
 
 DATADIR=	${PREFIX}/share/cairo-dock
 
-PLIST_SUB=	PYVER="${PYTHON_VERSION:S/thon//}"
-
 OPTIONS_DEFAULT=	GMENU
 OPTIONS_GROUP=		ADDON INTEGR PLUGINS
 OPTIONS_GROUP_ADDON=	EXIF ICAL UPOWER
@@ -74,7 +73,8 @@ GMENU_CMAKE_BOOL=		enable-gmenu
 GNOME_INTEGRATION_CMAKE_BOOL=	enable-gnome-integration
 ICAL_LIB_DEPENDS=		libical.so:devel/libical
 ICAL_CMAKE_BOOL=		enable-ical-support
-IMPULSE_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+IMPULSE_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
+				libpulse.so:audio/pulseaudio
 IMPULSE_CMAKE_BOOL=		enable-impulse
 KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:graphics/libexif \
 				libxklavier.so:x11/libxklavier
@@ -85,17 +85,17 @@ MAIL_CMAKE_BOOL=		enable-mail
 SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 SOUND_EFFECTS_CMAKE_BOOL=	enable-sound-effects
-UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
+UPOWER_LIB_DEPENDS=		libpolkit-gobject-1.so:sysutils/polkit \
+				libupower-glib.so:sysutils/upower
 UPOWER_CMAKE_BOOL=		enable-upower-support
 XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:graphics/libexif
 XFCE_INTEGRATION_CMAKE_BOOL=	enable-xfce-integration
+XGAMMA_LIB_DEPENDS=		libXxf86vm.so:x11/libXxf86vm
 XGAMMA_RUN_DEPENDS=		xgamma:x11/xgamma
 XGAMMA_CMAKE_BOOL=		enable-xgamma
 ZEITGEIST_LIB_DEPENDS=		libzeitgeist-2.0.so:sysutils/zeitgeist
 ZEITGEIST_CMAKE_BOOL=		enable-recent-events
 
-ICONS_PACKAGE=	cairo-dock-plugins-png-icons
-
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
@@ -103,13 +103,10 @@ CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f \( -name "*.c" -o -name "*.conf" \
-		-o -name netspeed -o -name nvidia-config -o -name "*.sh" \
-		-o -name "*.rb" \) | ${XARGS} ${REINPLACE_CMD} -i.orig -e \
-	    's|/bin/bash|${LOCALBASE}/bin/bash|g; \
-	     s|/usr/bin/python|${PYTHON_CMD}|g; \
-	     s|/usr/bin/ruby|${LOCALBASE}/bin/ruby|g; \
-	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
-	     s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
+	@${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' \
+		${WRKSRC}/Dbus/data/cairo-dock-launcher-API-daemon.py
+	@${FIND} ${WRKSRC} -type f \( -name "*.c" -o -name "*.conf" -o -name netspeed \
+		-o -name nvidia-config -o -name "*.sh" -o -name "*.rb" \) | \
+		${XARGS} ${REINPLACE_CMD} -i.orig -e 's|/bin/bash|${LOCALBASE}/bin/bash|g; s|/usr/bin/python|${PYTHON_CMD}|g; s|/usr/bin/ruby|${LOCALBASE}/bin/ruby|g; s|/usr/share/applications|${LOCALBASE}/share/applications|g; s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/cairo-dock-plugins/distinfo b/deskutils/cairo-dock-plugins/distinfo
index facc9b22ef9d..b01cd8f8c462 100644
--- a/deskutils/cairo-dock-plugins/distinfo
+++ b/deskutils/cairo-dock-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707240303
-SHA256 (Cairo-Dock-cairo-dock-plug-ins-3.5.0_GH0.tar.gz) = cf1ff262ee75ef69caa846a447de1738c8c5f3afa9fdbbdf9c51d623692f5636
-SIZE (Cairo-Dock-cairo-dock-plug-ins-3.5.0_GH0.tar.gz) = 7465207
+TIMESTAMP = 1735749478
+SHA256 (Cairo-Dock-cairo-dock-plug-ins-3.5.1_GH0.tar.gz) = d776c791daa799c65833e912107a53a95ed80651f8296855ddc7da4215aa72ab
+SIZE (Cairo-Dock-cairo-dock-plug-ins-3.5.1_GH0.tar.gz) = 7443147
diff --git a/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt b/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt
deleted file mode 100644
index d82a6bc0f7f7..000000000000
--- a/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- CMakeLists.txt.orig	2015-02-19 16:13:47 UTC
-+++ CMakeLists.txt
-@@ -978,9 +978,8 @@ set (with_mail no)
- # find the compilation flags
- enable_if_not_defined (enable-mail)
- if (enable-mail)
--	find_program (LIBETPAN_CONFIG_EXECUTABLE libetpan-config)
- 	execute_process(
--		COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --cflags
-+		COMMAND pkg-config libetpan --cflags
- 		OUTPUT_VARIABLE MAIL_PACKAGE_CFLAGS)
- 	if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "" AND NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "\n") # if there is a problem with the previous, we don't want to have a lot of errors
- 		STRING (REGEX REPLACE "\n" "" TMP_VARIABLE "${MAIL_PACKAGE_CFLAGS}") # to not skip the last option
-@@ -993,7 +992,7 @@ if (enable-mail)
- 	endif()
- 	# find the link flags
- 	execute_process(
--		COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --libs
-+		COMMAND pkg-config libetpan --libs
- 		OUTPUT_VARIABLE MAIL_PACKAGE_LIBS)
- 	if (NOT "${MAIL_PACKAGE_LIBS}" STREQUAL "")
- 		STRING (REGEX REPLACE "\n" "" MAIL_PACKAGE_LIBS "${MAIL_PACKAGE_LIBS}")
diff --git a/deskutils/cairo-dock-plugins/files/patch-Dbus_src_CMakeLists.txt b/deskutils/cairo-dock-plugins/files/patch-Dbus_src_CMakeLists.txt
new file mode 100644
index 000000000000..d723caf66115
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/files/patch-Dbus_src_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- Dbus/src/CMakeLists.txt.orig	2025-01-04 11:04:38 UTC
++++ Dbus/src/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}")
+ add_definitions (-DMY_APPLET_ICON_FILE="icon.svg")
+ add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}")
+ 
+-IF (${CMAKE_SYSTEM_NAME} MATCHES ^"FreeBSD")
++IF (${CMAKE_SYSTEM_NAME} MATCHES "^FreeBSD")
+ 	set(kvm "kvm")
+ endif()
+ 
diff --git a/deskutils/cairo-dock-plugins/pkg-plist b/deskutils/cairo-dock-plugins/pkg-plist
index 344eda2b5adf..680f32192f52 100644
--- a/deskutils/cairo-dock-plugins/pkg-plist
+++ b/deskutils/cairo-dock-plugins/pkg-plist
@@ -1,3 +1,4 @@
+lib/cairo-dock/cairo-dock-launcher-API-daemon
 %%ALSA_MIXER%%lib/cairo-dock/libcd-AlsaMixer.so
 lib/cairo-dock/libcd-Animated-icons.so
 lib/cairo-dock/libcd-Cairo-Penguin.so
@@ -5,12 +6,12 @@ lib/cairo-dock/libcd-Clipper.so
 lib/cairo-dock/libcd-Composite-Manager.so
 lib/cairo-dock/libcd-Dbus.so
 lib/cairo-dock/libcd-Folders.so
+%%GMENU%%lib/cairo-dock/libcd-GMenu.so
 %%IMPULSE%%lib/cairo-dock/libcd-Impulse.so
-lib/cairo-dock/libcd-Remote-Control.so
 %%ZEITGEIST%%lib/cairo-dock/libcd-Recent-Events.so
+lib/cairo-dock/libcd-Remote-Control.so
 lib/cairo-dock/libcd-Screenshot.so
 %%SOUND_EFFECTS%%lib/cairo-dock/libcd-Sound-Effects.so
-%%GMENU%%lib/cairo-dock/libcd-GMenu.so
 lib/cairo-dock/libcd-Toons.so
 %%XGAMMA%%lib/cairo-dock/libcd-Xgamma.so
 lib/cairo-dock/libcd-clock.so
@@ -21,7 +22,7 @@ lib/cairo-dock/libcd-drop_indicator.so
 lib/cairo-dock/libcd-dustbin.so
 lib/cairo-dock/libcd-icon-effect.so
 lib/cairo-dock/libcd-illusion.so
-lib/cairo-dock/libcd_kde-integration.so
+%%KEYBOARD_INDICATOR%%lib/cairo-dock/libcd-keyboard-indicator.so
 lib/cairo-dock/libcd-logout.so
 %%MAIL%%lib/cairo-dock/libcd-mail.so
 lib/cairo-dock/libcd-motion_blur.so
@@ -36,14 +37,16 @@ lib/cairo-dock/libcd-showDesktop.so
 lib/cairo-dock/libcd-show_mouse.so
 lib/cairo-dock/libcd-slider.so
 lib/cairo-dock/libcd-stack.so
+lib/cairo-dock/libcd-status-notifier.so
 lib/cairo-dock/libcd-switcher.so
 lib/cairo-dock/libcd-system-monitor.so
 lib/cairo-dock/libcd-systray.so
+lib/cairo-dock/libcd-terminal.so
 lib/cairo-dock/libcd-tomboy.so
 lib/cairo-dock/libcd-weather.so
 lib/cairo-dock/libcd-wifi.so
 %%GNOME_INTEGRATION%%lib/cairo-dock/libcd_gnome-integration.so
-%%KEYBOARD_INDICATOR%%lib/cairo-dock/libcd-keyboard-indicator.so
+lib/cairo-dock/libcd_kde-integration.so
 %%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.so
 %%DATADIR%%/gauges/Battery-Mono/0.svg
 %%DATADIR%%/gauges/Battery-Mono/1.svg
@@ -157,21 +160,16 @@ lib/cairo-dock/libcd-wifi.so
 %%IMPULSE%%%%DATADIR%%/plug-ins/Impulse/impulse-running.svg
 %%IMPULSE%%%%DATADIR%%/plug-ins/Impulse/impulse-stopped.svg
 %%IMPULSE%%%%DATADIR%%/plug-ins/Impulse/preview.jpg
-%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/caps-lock.png
-%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/icon.png
-%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/keyboard-indicator.conf
-%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/num-lock.png
-%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/preview.jpg
 %%DATADIR%%/plug-ins/RSSreader/RSSreader.conf
 %%DATADIR%%/plug-ins/RSSreader/icon.svg
 %%DATADIR%%/plug-ins/RSSreader/preview.jpg
+%%ZEITGEIST%%%%DATADIR%%/plug-ins/Recent-Events/Recent-Events.conf
+%%ZEITGEIST%%%%DATADIR%%/plug-ins/Recent-Events/icon.svg
+%%ZEITGEIST%%%%DATADIR%%/plug-ins/Recent-Events/preview.jpg
 %%DATADIR%%/plug-ins/Remote-Control/Remote-Control.conf
 %%DATADIR%%/plug-ins/Remote-Control/arrows.svg
 %%DATADIR%%/plug-ins/Remote-Control/icon.png
 %%DATADIR%%/plug-ins/Remote-Control/preview.jpg
-%%ZEITGEIST%%%%DATADIR%%/plug-ins/Recent-Events/Recent-Events.conf
-%%ZEITGEIST%%%%DATADIR%%/plug-ins/Recent-Events/icon.svg
-%%ZEITGEIST%%%%DATADIR%%/plug-ins/Recent-Events/preview.jpg
 %%DATADIR%%/plug-ins/Screenshot/Screenshot.conf
 %%DATADIR%%/plug-ins/Screenshot/icon.svg
 %%DATADIR%%/plug-ins/Screenshot/preview.jpg
@@ -181,6 +179,10 @@ lib/cairo-dock/libcd-wifi.so
 %%SOUND_EFFECTS%%%%DATADIR%%/plug-ins/Sound-Effects/on-hover.wav
 %%SOUND_EFFECTS%%%%DATADIR%%/plug-ins/Sound-Effects/on-middle-click.wav
 %%SOUND_EFFECTS%%%%DATADIR%%/plug-ins/Sound-Effects/preview.png
+%%DATADIR%%/plug-ins/Status-Notifier/Status-Notifier.conf
+%%DATADIR%%/plug-ins/Status-Notifier/icon-broken.svg
+%%DATADIR%%/plug-ins/Status-Notifier/icon.png
+%%DATADIR%%/plug-ins/Status-Notifier/preview.jpg
 %%DATADIR%%/plug-ins/System-monitor/System-Monitor.conf
 %%DATADIR%%/plug-ins/System-monitor/button-cpu.svg
 %%DATADIR%%/plug-ins/System-monitor/button-ram.svg
@@ -274,6 +276,11 @@ lib/cairo-dock/libcd-wifi.so
 %%DATADIR%%/plug-ins/illusion/illusion.conf
 %%DATADIR%%/plug-ins/illusion/preview.jpg
 %%DATADIR%%/plug-ins/kde-integration/icon.png
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/caps-lock.png
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/icon.png
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/keyboard-indicator.conf
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/num-lock.png
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/preview.jpg
 %%DATADIR%%/plug-ins/logout/icon-scheduling.svg
 %%DATADIR%%/plug-ins/logout/icon.svg
 %%DATADIR%%/plug-ins/logout/locked.svg
@@ -384,6 +391,9 @@ lib/cairo-dock/libcd-wifi.so
 %%DATADIR%%/plug-ins/systray/icon.png
 %%DATADIR%%/plug-ins/systray/preview.jpg
 %%DATADIR%%/plug-ins/systray/systray.conf
+%%DATADIR%%/plug-ins/terminal/icon.png
+%%DATADIR%%/plug-ins/terminal/preview.jpg
+%%DATADIR%%/plug-ins/terminal/terminal.conf
 %%DATADIR%%/plug-ins/tomboy/close.svg
 %%DATADIR%%/plug-ins/tomboy/icon.svg
 %%DATADIR%%/plug-ins/tomboy/note.svg