diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 9b006c413fb1..d5d3ea3cee79 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -1,50 +1,55 @@ PORTNAME= workrave -PORTVERSION= 1.10.44 -PORTREVISION= 3 +PORTVERSION= 1.10.50 +DISTVERSIONPREFIX= v CATEGORIES= x11 MASTER_SITES= https://github.com/rcaelers/workrave/releases/download/v${PORTVERSION:S/./_/g}/ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= RSI prevention tool WWW= https://www.workrave.org/ LICENSE= GPLv3+ LIB_DEPENDS= libgdome.so:textproc/gdome2 \ libharfbuzz.so:print/harfbuzz -USES= compiler:c++11-lang gettext gmake gnome libtool localbase \ - pkgconfig xorg +USES= compiler:c++11-lang gmake gnome libtool localbase pkgconfig \ + xorg USE_CXXSTD= c++11 USE_GNOME= gdkpixbuf2 gtkmm30 intlhack intltool introspection:build 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 \ --disable-xfce INSTALL_TARGET= install-strip -OPTIONS_DEFINE= DBUS DISTRIBUTION GSTREAMER +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +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:3.5+,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 + .include diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo index a8d8194c38da..f9511a189589 100644 --- a/x11/workrave/distinfo +++ b/x11/workrave/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614542912 -SHA256 (workrave-1.10.44.tar.gz) = 6a87710403ca4c88ef05137cc9414b4a2a518b94f1f107eecdf83dbde490ba37 -SIZE (workrave-1.10.44.tar.gz) = 6953835 +TIMESTAMP = 1669512834 +SHA256 (workrave-v1.10.50.tar.gz) = d667444b933ef08d6f1471277acc650267868c2006c420a34feb1cb5cd64853b +SIZE (workrave-v1.10.50.tar.gz) = 11068099 diff --git a/x11/workrave/files/patch-backend_include_ICore.hh b/x11/workrave/files/patch-backend_include_ICore.hh index eb3893c0864e..dd2d525b8227 100644 --- a/x11/workrave/files/patch-backend_include_ICore.hh +++ b/x11/workrave/files/patch-backend_include_ICore.hh @@ -1,11 +1,11 @@ This is needed for compiling on FreeBSD >= 11.0. ---- backend/include/ICore.hh.orig 2016-08-03 13:08:26 UTC +--- backend/include/ICore.hh.orig 2022-04-01 16:28:54 UTC +++ backend/include/ICore.hh @@ -21,6 +21,7 @@ #define ICORE_HH #include +#include + #include #include "enum.h" - diff --git a/x11/workrave/files/patch-backend_src_unix_MutterInputMonitor.cc b/x11/workrave/files/patch-backend_src_unix_MutterInputMonitor.cc new file mode 100644 index 000000000000..9b4754597653 --- /dev/null +++ b/x11/workrave/files/patch-backend_src_unix_MutterInputMonitor.cc @@ -0,0 +1,29 @@ +--- backend/src/unix/MutterInputMonitor.cc.orig 2022-04-01 16:28:54 UTC ++++ backend/src/unix/MutterInputMonitor.cc +@@ -245,7 +245,7 @@ MutterInputMonitor::unregister_active_watch() + if (watch_active != 0u) + { + GVariant *result = g_dbus_proxy_call_sync( +- idle_proxy, "RemoveWatch", g_variant_new("(u)", watch_active), G_DBUS_CALL_FLAGS_NONE, 10000, NULL, &error); ++ idle_proxy, "RemoveWatch", g_variant_new("(u)", watch_active.get()), G_DBUS_CALL_FLAGS_NONE, 10000, NULL, &error); + if (error == NULL) + { + g_variant_unref(result); +@@ -269,7 +269,7 @@ MutterInputMonitor::unregister_active_watch_async() + { + g_dbus_proxy_call(idle_proxy, + "RemoveWatch", +- g_variant_new("(u)", watch_active), ++ g_variant_new("(u)", watch_active.get()), + G_DBUS_CALL_FLAGS_NONE, + 10000, + NULL, +@@ -331,7 +331,7 @@ MutterInputMonitor::unregister_idle_watch() + if (watch_idle != 0u) + { + GVariant *result = g_dbus_proxy_call_sync( +- idle_proxy, "RemoveWatch", g_variant_new("(u)", watch_idle), G_DBUS_CALL_FLAGS_NONE, 10000, NULL, &error); ++ idle_proxy, "RemoveWatch", g_variant_new("(u)", watch_idle.get()), G_DBUS_CALL_FLAGS_NONE, 10000, NULL, &error); + if (error == NULL) + { + g_variant_unref(result); diff --git a/x11/workrave/files/patch-common_src_Locale.cc b/x11/workrave/files/patch-common_src_Locale.cc index d13fd32da71c..34f8c7850790 100644 --- a/x11/workrave/files/patch-common_src_Locale.cc +++ b/x11/workrave/files/patch-common_src_Locale.cc @@ -1,27 +1,27 @@ ---- common/src/Locale.cc.orig 2016-05-11 16:14:20 UTC +--- common/src/Locale.cc.orig 2022-04-01 16:28:54 UTC +++ common/src/Locale.cc -@@ -258,22 +258,8 @@ Locale::get_week_start() - - #ifdef PLATFORM_OS_UNIX - union { unsigned int word; char *string; } langinfo; +@@ -259,22 +259,8 @@ Locale::get_week_start() + unsigned int word; + char *string; + } langinfo; - gint week_1stday = 0; - gint first_weekday = 1; - guint week_origin; -- +- - langinfo.string = nl_langinfo(_NL_TIME_FIRST_WEEKDAY); - first_weekday = langinfo.string[0]; - langinfo.string = nl_langinfo(_NL_TIME_WEEK_1STDAY); - week_origin = langinfo.word; - if (week_origin == 19971130) /* Sunday */ - week_1stday = 0; - else if (week_origin == 19971201) /* Monday */ - week_1stday = 1; - else -- g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n"); +- g_warning("Unknown value of _NL_TIME_WEEK_1STDAY.\n"); - - week_start = (week_1stday + first_weekday - 1) % 7; + langinfo.string = nl_langinfo(DAY_1); + week_start = langinfo.string[0]; #endif return week_start; diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist index 4206a5e67643..e0bdac2e70f7 100644 --- a/x11/workrave/pkg-plist +++ b/x11/workrave/pkg-plist @@ -1,120 +1,134 @@ bin/workrave lib/girepository-1.0/Workrave-1.0.typelib 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/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 %%DATADIR%%/exercises/exercises.xml %%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