Date: Sat, 4 Jan 2025 23:01:09 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2df4b6c55014 - main - deskutils/cairo-dock: Update to 3.5.1 Message-ID: <202501042301.504N19o2072656@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=2df4b6c55014060589610d4ca4d8e0aa9ea5af93 commit 2df4b6c55014060589610d4ca4d8e0aa9ea5af93 Author: Yusuf Yaman <nxjoseph@protonmail.com> AuthorDate: 2025-01-04 22:12:36 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2025-01-04 23:00:29 +0000 deskutils/cairo-dock: Update to 3.5.1 - Submitter becomes maintainer - Pet Q/A check by cleaning some sed cmds ChangeLog: https://github.com/Cairo-Dock/cairo-dock-core/releases/tag/3.5.1 PR: 283772 --- deskutils/cairo-dock/Makefile | 44 ++++++++++++++++++++++++++---------------- deskutils/cairo-dock/distinfo | 6 +++--- deskutils/cairo-dock/pkg-plist | 8 ++++---- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile index 9325f28810d1..4daabe02fce8 100644 --- a/deskutils/cairo-dock/Makefile +++ b/deskutils/cairo-dock/Makefile @@ -1,8 +1,8 @@ PORTNAME= cairo-dock -DISTVERSION= 3.5.0 +DISTVERSION= 3.5.1 CATEGORIES= deskutils -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nxjoseph@protonmail.com COMMENT= Lightweight and eye-candy dock (program launcher) WWW= https://www.glx-dock.org/ @@ -13,26 +13,28 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libcurl.so:ftp/curl \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ - libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= bash:shells/bash \ + compiz:x11-wm/compiz \ sox:audio/sox -#USES= cmake compiler:c++11-lang gettext gl gnome localbase:ldflags -USES= cmake gettext gl gnome localbase:ldflags pkgconfig +USES= cmake gettext gl gnome localbase:ldflags pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= Cairo-Dock GH_PROJECT= ${PORTNAME}-core USE_GL= glu USE_GNOME= glib20 gtk30 librsvg2 libxml2 USE_LDCONFIG= yes +SHEBANG_FILES= data/scripts/cairo-dock-package-theme.sh \ + data/scripts/help_scripts.sh \ + data/scripts/initial-setup.sh -OPTIONS_DEFINE= X11 WAYLAND -OPTIONS_DEFAULT=EGL WAYLAND X11 -OPTIONS_RADIO= GL -OPTIONS_RADIO_GL= GLX EGL +OPTIONS_DEFINE= WAYLAND X11 +OPTIONS_DEFAULT= EGL WAYLAND X11 +OPTIONS_RADIO= GL +OPTIONS_RADIO_GL= EGL GLX -EGL_DESC= ${GLX_DESC:S/X11/Native/} +EGL_DESC= ${GLX_DESC:S/X11/Native/} EGL_USE= GL=egl EGL_CMAKE_BOOL= enable-egl-support @@ -48,13 +50,21 @@ X11_USE= XORG=x11,xcomposite,xinerama,xrandr,xrender,xtst X11_CMAKE_BOOL= enable-x11-support post-patch: - @${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \ - s|/usr/bin/cairo-dock|${LOCALBASE}/bin/cairo-dock|g; \ - s|/bin/bash|${LOCALBASE}/bin/bash|g; \ - s|/usr/share/applications|${LOCALBASE}/share/applications|g; \ - s|/usr/share/icons|${LOCALBASE}/share/icons|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g;' + @${REINPLACE_CMD} -e 's|/usr/share/pixmaps|${LOCALBASE}/share/pixmaps|g' \ + ${WRKSRC}/data/cairo-dock \ + ${WRKSRC}/src/gldit/cairo-dock-gui-factory.c + @${REINPLACE_CMD} -e 's|/usr/share/icons|${LOCALBASE}/share/icons|g' \ + ${WRKSRC}/src/gldit/cairo-dock-gui-factory.c \ + ${WRKSRC}/src/cairo-dock-user-menu.c + @${REINPLACE_CMD} -e 's|/usr/share/applications|${LOCALBASE}/share/applications|g' \ + ${WRKSRC}/src/gldit/cairo-dock-class-manager.c + @${FIND} ${WRKSRC} -type f -name "*.desktop" ! -exec ${GREP} -q "/usr/share/applications" \ + {} \; | \ + ${XARGS} ${REINPLACE_CMD} -e 's|/usr/share/applications|${LOCALBASE}/share/applications|g' + @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \ + ${WRKSRC}/data/desktop-manager/cairo-dock-session + @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' \ + ${WRKSRC}/data/cairo-dock post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so diff --git a/deskutils/cairo-dock/distinfo b/deskutils/cairo-dock/distinfo index bc51761bd6cc..68f23dce0daa 100644 --- a/deskutils/cairo-dock/distinfo +++ b/deskutils/cairo-dock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707236969 -SHA256 (Cairo-Dock-cairo-dock-core-3.5.0_GH0.tar.gz) = 67af81683d8178e12f8c2f190936f68658eb1e091d974416a7d1472cc8c7ab63 -SIZE (Cairo-Dock-cairo-dock-core-3.5.0_GH0.tar.gz) = 2939126 +TIMESTAMP = 1735734555 +SHA256 (Cairo-Dock-cairo-dock-core-3.5.1_GH0.tar.gz) = a03e71025aa44c01eaccf1ed922bd5497ac4ac1df581f81ec7e8429dcd1c57f4 +SIZE (Cairo-Dock-cairo-dock-core-3.5.1_GH0.tar.gz) = 2939420 diff --git a/deskutils/cairo-dock/pkg-plist b/deskutils/cairo-dock/pkg-plist index 8a012d447865..a6a6ee780e83 100644 --- a/deskutils/cairo-dock/pkg-plist +++ b/deskutils/cairo-dock/pkg-plist @@ -71,9 +71,8 @@ include/cairo-dock/implementations/cairo-dock-progressbar.h lib/cairo-dock/libcd-Help.so lib/libgldi.so lib/libgldi.so.3 -lib/libgldi.so.3.5.0 +lib/libgldi.so.3.5.1 libdata/pkgconfig/gldi.pc -share/man/man1/cairo-dock.1.gz share/applications/cairo-dock-cairo.desktop share/applications/cairo-dock.desktop %%DATADIR%%/ChangeLog.txt @@ -167,7 +166,7 @@ share/applications/cairo-dock.desktop %%DATADIR%%/themes/Default-Panel/images/indicator.png %%DATADIR%%/themes/Default-Panel/launchers/01container.desktop %%DATADIR%%/themes/Default-Panel/launchers/01firefox.desktop -%%DATADIR%%/themes/Default-Panel/launchers/01gcalctool.desktop +%%DATADIR%%/themes/Default-Panel/launchers/01gnome-calculator.desktop %%DATADIR%%/themes/Default-Panel/launchers/01libreoffice-calc.desktop %%DATADIR%%/themes/Default-Panel/launchers/01libreoffice-impress.desktop %%DATADIR%%/themes/Default-Panel/launchers/01libreoffice-writer.desktop @@ -210,8 +209,8 @@ share/applications/cairo-dock.desktop %%DATADIR%%/themes/Default-Single/images/bg.svg %%DATADIR%%/themes/Default-Single/images/indicator.png %%DATADIR%%/themes/Default-Single/launchers/01firefox.desktop -%%DATADIR%%/themes/Default-Single/launchers/01gcalctool.desktop %%DATADIR%%/themes/Default-Single/launchers/01gimp.desktop +%%DATADIR%%/themes/Default-Single/launchers/01gnome-calculator.desktop %%DATADIR%%/themes/Default-Single/launchers/01gnome-terminal.desktop %%DATADIR%%/themes/Default-Single/launchers/01ooo-writer.desktop %%DATADIR%%/themes/Default-Single/launchers/01pidgin.desktop @@ -285,4 +284,5 @@ share/locale/uz/LC_MESSAGES/cairo-dock.mo share/locale/vi/LC_MESSAGES/cairo-dock.mo share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo +share/man/man1/cairo-dock.1.gz share/pixmaps/cairo-dock.svg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501042301.504N19o2072656>