diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 06251bfa3ec6..90a7eff7fd2f 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -1,83 +1,85 @@ PORTNAME= workrave DISTVERSIONPREFIX= v -DISTVERSION= 1.10.50 -PORTREVISION= 4 +DISTVERSION= 1.10.53 CATEGORIES= x11 MASTER_SITES= https://github.com/rcaelers/workrave/releases/download/v${DISTVERSION:S/./_/g}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pauamma@gundo.com COMMENT= RSI prevention tool (${FLAVOR} flavor) WWW= https://www.workrave.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgdome.so:textproc/gdome2 \ - libharfbuzz.so:print/harfbuzz + libgraphene-1.0.so:graphics/graphene \ + libharfbuzz.so:print/harfbuzz \ + libvulkan.so:graphics/vulkan-loader FLAVORS= default xfce FLAVOR?= ${FLAVORS:[1]} default_CONFLICTS_INSTALL= workrave-xfce xfce_PKGNAMESUFFIX= -xfce xfce_CONFLICTS_INSTALL= workrave xfce_DESCR= ${.CURDIR}/pkg-descr.xfce -USES= compiler:c++11-lang desktop-file-utils gmake gnome libtool \ - localbase pkgconfig xorg +USES= compiler:c++11-lang gmake gnome libtool localbase pkgconfig xorg .if ${FLAVOR} == xfce CATEGORIES+= xfce USES+= xfce USE_XFCE= libutil panel # Easier than using *_SUB since there's no flavor helper for that. PLIST_FILES= lib/xfce4/panel/plugins/libworkrave-plugin.a \ lib/xfce4/panel/plugins/libworkrave-plugin.so \ share/xfce4/panel/plugins/workrave-xfce-applet.desktop .endif USE_CXXSTD= c++11 -USE_GNOME= gdkpixbuf gtkmm30 intlhack intltool introspection:build libxml2 +# gtkmm30 and gtk40 needed (the latter for lib/libworkrave-gtk4-private-1.0). +USE_GNOME= gdkpixbuf gtkmm30 gtk40 intlhack intltool introspection:build \ + libxml2 USE_LDCONFIG= yes USE_XORG= ice sm x11 xext xmu xorgproto xscrnsaver xtst GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gconf \ --disable-gnome3 \ --disable-gsettings \ --disable-indicator \ --disable-mate \ --disable-pulse .if ${FLAVOR} != xfce CONFIGURE_ARGS+= --disable-xfce .endif INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} OPTIONS_DEFINE= DBUS DISTRIBUTION GSTREAMER NLS OPTIONS_DEFAULT= DBUS GSTREAMER OPTIONS_SUB= yes DISTRIBUTION_DESC= Build with networking support DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ boost-libs>0:devel/boost-libs DBUS_USES= python:build DBUS_CONFIGURE_ENABLE= dbus DISTRIBUTION_CONFIGURE_ENABLE= distribution GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=good GSTREAMER_CONFIGURE_ENABLE= gstreamer NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls # Upstream recommends editing that file to add or remove exercises, # hence treat it like a config file. post-stage: ${MV} ${STAGEDIR}${DATADIR}/exercises/exercises.xml \ ${STAGEDIR}${DATADIR}/exercises/exercises.xml.sample .include diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo index f9511a189589..a467fa4b5130 100644 --- a/x11/workrave/distinfo +++ b/x11/workrave/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669512834 -SHA256 (workrave-v1.10.50.tar.gz) = d667444b933ef08d6f1471277acc650267868c2006c420a34feb1cb5cd64853b -SIZE (workrave-v1.10.50.tar.gz) = 11068099 +TIMESTAMP = 1756095604 +SHA256 (workrave-v1.10.53.tar.gz) = aa1455e50422b5133f464175428f62583bc06778e03c5ab032fddaf80889f2ca +SIZE (workrave-v1.10.53.tar.gz) = 11049542 diff --git a/x11/workrave/files/patch-configure b/x11/workrave/files/patch-configure index 6e0b06cc99bb..0acfc371eb7e 100644 --- a/x11/workrave/files/patch-configure +++ b/x11/workrave/files/patch-configure @@ -1,59 +1,59 @@ Fix bashism and force GStreamer 1.x support ---- configure.orig 2020-03-08 02:42:31 UTC +--- configure.orig 2025-08-25 23:15:55 UTC +++ configure -@@ -20993,7 +20993,7 @@ then +@@ -22713,7 +22713,7 @@ then loop=${enable_monitors}, - while echo $loop | grep \, &> /dev/null + while echo $loop | grep -q \, do monitor=${loop%%\,*} loop=${loop#*\,} -@@ -24438,44 +24438,9 @@ config_gstreamer=no +@@ -26195,44 +26195,10 @@ config_gstreamer=no if test "x$enable_gstreamer" != "xno"; then -pkg_failed=no +pkg_failed=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5 - $as_echo_n "checking for GSTREAMER... " >&6; } -- + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gstreamer-0.10" >&5 + printf %s "checking for gstreamer-0.10... " >&6; } + -if test -n "$GSTREAMER_CFLAGS"; then - pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5 +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GSTREAMER_LIBS"; then - pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5 +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi diff --git a/x11/workrave/files/patch-frontend_applets_Makefile.in b/x11/workrave/files/patch-frontend_applets_Makefile.in index 7d2ee28a1985..056c368f9637 100644 --- a/x11/workrave/files/patch-frontend_applets_Makefile.in +++ b/x11/workrave/files/patch-frontend_applets_Makefile.in @@ -1,11 +1,11 @@ ---- frontend/applets/Makefile.in.orig 2020-03-04 20:08:42 UTC +--- frontend/applets/Makefile.in.orig 2025-02-16 12:01:58 UTC +++ frontend/applets/Makefile.in -@@ -438,7 +438,7 @@ top_build_prefix = @top_build_prefix@ +@@ -446,7 +446,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in --SUBDIRS = win32 common gnome3 indicator gnome-shell cinnamon xfce mate +-SUBDIRS = win32 common gnome3 indicator gnome-shell gnome-shell-45 cinnamon xfce mate +SUBDIRS = win32 common gnome3 indicator xfce mate all: all-recursive .SUFFIXES: diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist index 583293e1d3e2..5099f9bba43b 100644 --- a/x11/workrave/pkg-plist +++ b/x11/workrave/pkg-plist @@ -1,134 +1,140 @@ bin/workrave lib/girepository-1.0/Workrave-1.0.typelib +lib/girepository-1.0/Workrave-2.0.typelib +lib/libworkrave-gtk4-private-1.0.a +lib/libworkrave-gtk4-private-1.0.so +lib/libworkrave-gtk4-private-1.0.so.0 +lib/libworkrave-gtk4-private-1.0.so.0.0.0 lib/libworkrave-private-1.0.a lib/libworkrave-private-1.0.so lib/libworkrave-private-1.0.so.0 lib/libworkrave-private-1.0.so.0.0.0 share/applications/workrave.desktop %%DBUS%%share/dbus-1/services/org.workrave.Workrave.service share/gir-1.0/Workrave-1.0.gir +share/gir-1.0/Workrave-2.0.gir share/icons/hicolor/128x128/apps/workrave.png share/icons/hicolor/16x16/apps/workrave.png share/icons/hicolor/24x24/apps/workrave.png share/icons/hicolor/32x32/apps/workrave.png share/icons/hicolor/48x48/apps/workrave.png share/icons/hicolor/64x64/apps/workrave.png share/icons/hicolor/96x96/apps/workrave.png share/icons/hicolor/scalable/apps/workrave.svg share/icons/hicolor/scalable/workrave-sheep.svg share/locale/bg/LC_MESSAGES/workrave.mo share/locale/ca/LC_MESSAGES/workrave.mo share/locale/cs/LC_MESSAGES/workrave.mo share/locale/da/LC_MESSAGES/workrave.mo share/locale/de/LC_MESSAGES/workrave.mo share/locale/el/LC_MESSAGES/workrave.mo share/locale/eo/LC_MESSAGES/workrave.mo share/locale/es/LC_MESSAGES/workrave.mo share/locale/et/LC_MESSAGES/workrave.mo share/locale/eu/LC_MESSAGES/workrave.mo share/locale/fa/LC_MESSAGES/workrave.mo share/locale/fi/LC_MESSAGES/workrave.mo share/locale/fr/LC_MESSAGES/workrave.mo share/locale/ga/LC_MESSAGES/workrave.mo share/locale/he/LC_MESSAGES/workrave.mo share/locale/hr/LC_MESSAGES/workrave.mo share/locale/hu/LC_MESSAGES/workrave.mo share/locale/id/LC_MESSAGES/workrave.mo share/locale/it/LC_MESSAGES/workrave.mo share/locale/ja/LC_MESSAGES/workrave.mo share/locale/ko/LC_MESSAGES/workrave.mo share/locale/lt/LC_MESSAGES/workrave.mo share/locale/nb/LC_MESSAGES/workrave.mo share/locale/nl/LC_MESSAGES/workrave.mo share/locale/pl/LC_MESSAGES/workrave.mo share/locale/pt/LC_MESSAGES/workrave.mo share/locale/pt_BR/LC_MESSAGES/workrave.mo share/locale/ro/LC_MESSAGES/workrave.mo share/locale/ru/LC_MESSAGES/workrave.mo share/locale/sk/LC_MESSAGES/workrave.mo share/locale/sl/LC_MESSAGES/workrave.mo share/locale/sr@latin/LC_MESSAGES/workrave.mo share/locale/sv/LC_MESSAGES/workrave.mo share/locale/te/LC_MESSAGES/workrave.mo share/locale/tr/LC_MESSAGES/workrave.mo share/locale/uk/LC_MESSAGES/workrave.mo share/locale/zh_CN/LC_MESSAGES/workrave.mo share/locale/zh_TW/LC_MESSAGES/workrave.mo share/metainfo/workrave.appdata.xml share/sounds/workrave/bells/break-ignored.wav share/sounds/workrave/bells/break-prelude.wav share/sounds/workrave/bells/daily-limit.wav share/sounds/workrave/bells/exercise-ended.wav share/sounds/workrave/bells/exercise-step.wav share/sounds/workrave/bells/exercises-ended.wav share/sounds/workrave/bells/micro-break-ended.wav share/sounds/workrave/bells/micro-break-started.wav share/sounds/workrave/bells/rest-break-ended.wav share/sounds/workrave/bells/rest-break-started.wav share/sounds/workrave/bells/soundtheme share/sounds/workrave/default/break-ignored.wav share/sounds/workrave/default/break-prelude.wav share/sounds/workrave/default/daily-limit.wav share/sounds/workrave/default/exercise-ended.wav share/sounds/workrave/default/exercise-step.wav share/sounds/workrave/default/exercises-ended.wav share/sounds/workrave/default/micro-break-ended.wav share/sounds/workrave/default/micro-break-started.wav share/sounds/workrave/default/rest-break-ended.wav share/sounds/workrave/default/rest-break-started.wav share/sounds/workrave/default/soundtheme share/sounds/workrave/subtle/break-ignored.wav share/sounds/workrave/subtle/break-prelude.wav share/sounds/workrave/subtle/daily-limit.wav share/sounds/workrave/subtle/exercise-ended.wav share/sounds/workrave/subtle/exercise-step.wav share/sounds/workrave/subtle/exercises-ended.wav share/sounds/workrave/subtle/micro-break-ended.wav share/sounds/workrave/subtle/micro-break-started.wav share/sounds/workrave/subtle/rest-break-ended.wav share/sounds/workrave/subtle/rest-break-started.wav share/sounds/workrave/subtle/soundtheme %%DATADIR%%/exercises/backward-shoulder-stretch.png %%DATADIR%%/exercises/chair-pushup-1.png %%DATADIR%%/exercises/chair-pushup-2.png %%DATADIR%%/exercises/depth-focus-1.png %%DATADIR%%/exercises/depth-focus-2.png @sample %%DATADIR%%/exercises/exercises.xml.sample %%DATADIR%%/exercises/eye-darkness.png %%DATADIR%%/exercises/finger-stretch-1.png %%DATADIR%%/exercises/finger-stretch-2.png %%DATADIR%%/exercises/fist-roll-1.png %%DATADIR%%/exercises/fist-roll-2.png %%DATADIR%%/exercises/monitor-border-1.png %%DATADIR%%/exercises/monitor-border-2.png %%DATADIR%%/exercises/monitor-border-3.png %%DATADIR%%/exercises/monitor-border-4.png %%DATADIR%%/exercises/neck-tilt-stretch-1.png %%DATADIR%%/exercises/neck-tilt-stretch-2.png %%DATADIR%%/exercises/rotate-arm.png %%DATADIR%%/exercises/shoulder-arm-stretch.png %%DATADIR%%/exercises/turn-head-1.png %%DATADIR%%/exercises/turn-head-2.png %%DATADIR%%/exercises/wrist-lower-arm-desk-stretch-1.png %%DATADIR%%/images/daily-limit.png %%DATADIR%%/images/display.png %%DATADIR%%/images/lock.png %%DATADIR%%/images/micro-break.png %%DATADIR%%/images/monitoring.png %%DATADIR%%/images/network.png %%DATADIR%%/images/prelude-hint-sad.png %%DATADIR%%/images/prelude-hint.png %%DATADIR%%/images/rest-break.png %%DATADIR%%/images/shutdown.png %%DATADIR%%/images/time.png %%DATADIR%%/images/timer-daily-large.png %%DATADIR%%/images/timer-daily.png %%DATADIR%%/images/timer-micro-break-large.png %%DATADIR%%/images/timer-micro-break.png %%DATADIR%%/images/timer-rest-break-large.png %%DATADIR%%/images/timer-rest-break.png %%DATADIR%%/images/workrave-icon-medium.png %%DATADIR%%/images/workrave-quiet-icon-medium.png %%DATADIR%%/images/workrave-suspended-icon-medium.png %%DATADIR%%/images/workrave.png %%DATADIR%%/images/workrave.xpm