git: f91d5bcf05a7 - main - x11/workrave: Update to 1.10.50
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Nov 2022 06:37:27 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f91d5bcf05a78c2855a100e4e7bc192440043164
commit f91d5bcf05a78c2855a100e4e7bc192440043164
Author: Naram Qashat <cyberbotx@cyberbotx.com>
AuthorDate: 2022-11-28 06:42:11 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-11-29 06:33:20 +0000
x11/workrave: Update to 1.10.50
Changelogs since last update:
* https://github.com/rcaelers/workrave/releases/tag/v1_10_45
* https://github.com/rcaelers/workrave/releases/tag/v1_10_47
* https://github.com/rcaelers/workrave/releases/tag/v1_10_48
* https://github.com/rcaelers/workrave/releases/tag/v1_10_49
* https://github.com/rcaelers/workrave/releases/tag/v1_10_50
PR: 268027
Reported by: cyberbotx@cyberbotx.com (maintainer)
---
x11/workrave/Makefile | 15 +++++++----
x11/workrave/distinfo | 6 ++---
x11/workrave/files/patch-backend_include_ICore.hh | 4 +--
.../patch-backend_src_unix_MutterInputMonitor.cc | 29 ++++++++++++++++++++++
x11/workrave/files/patch-common_src_Locale.cc | 14 +++++------
x11/workrave/pkg-plist | 14 +++++++++++
6 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 9b006c413fb1..d5d3ea3cee79 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -1,6 +1,6 @@
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}/
@@ -13,8 +13,8 @@ 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
@@ -30,7 +30,9 @@ CONFIGURE_ARGS= --disable-gconf \
--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
@@ -47,4 +49,7 @@ GSTREAMER_USES= gstreamer
GSTREAMER_USE= GSTREAMER=good
GSTREAMER_CONFIGURE_ENABLE= gstreamer
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+
.include <bsd.port.mk>
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 <string>
+#include <ctime>
+ #include <iostream>
#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,13 +1,13 @@
---- 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);
@@ -17,7 +17,7 @@
- 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);
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
@@ -55,6 +55,17 @@ 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
@@ -110,8 +121,11 @@ share/sounds/workrave/subtle/soundtheme
%%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