Update to workrave-1.10.44.

One less consumer of the old gstreamer-0.10 stack.
This commit is contained in:
ajacoutot 2021-03-03 09:35:08 +00:00
parent c6c0aec21f
commit 470030176b
12 changed files with 219 additions and 145 deletions

View File

@ -1,77 +1,74 @@
# $OpenBSD: Makefile,v 1.54 2021/02/26 18:20:36 naddy Exp $
# $OpenBSD: Makefile,v 1.55 2021/03/03 09:35:08 ajacoutot Exp $
# XXX check if still needed at next update
CXXFLAGS += -std=c++11
COMMENT= RSI prevention tool
COMMENT= reminder program for prevention of RSI
V= 1.10.44
DISTNAME= workrave-${V}
SHARED_LIBS += workrave-private-1.0 1.0 # unknown
DISTNAME= workrave-1.10.1
CATEGORIES= productivity x11
REVISION= 5
HOMEPAGE= http://www.workrave.org/
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xss Xtst atk-1.0 atk-bridge-2.0
WANTLIB += atkmm-1.6 atspi c cairo cairo-gobject cairomm-1.0 dbus-1
WANTLIB += dbus-glib-1 epoxy expat ffi fontconfig freetype gconf-2
WANTLIB += gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0
WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gstreamer-0.10
WANTLIB += gthread-2.0 gtk-3 gtkmm-3.0 harfbuzz iconv intl lzma m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1
WANTLIB += png pthread sigc-2.0 xcb xcb-render
WANTLIB += xcb-shm xml2 z fribidi
WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xtst atk-1.0
WANTLIB += atk-bridge-2.0 atkmm-1.6 c cairo cairo-gobject cairomm-1.0
WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
WANTLIB += gobject-2.0 graphite2 gstreamer-1.0 gthread-2.0 gtk-3
WANTLIB += gtkmm-3.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pangomm-1.4 pcre pixman-1 png sigc-2.0
WANTLIB += xcb xcb-render xcb-shm z
SHARED_LIBS += workrave-private-1.0 0.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=workrave/}
FIX_CRLF_FILES= po/ru.po
BUILD_DEPENDS= devel/py-cheetah \
devel/gobject-introspection \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS= devel/gconf2 \
multimedia/gstreamer-0.10/core \
x11/dbus-glib \
x11/gtk3mm
MASTER_SITES= https://github.com/rcaelers/workrave/releases/download/v${V:S/./_/g}/
MODULES= lang/python \
textproc/intltool
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
# c++11 (although only for building against libsigc++)
COMPILER = base-clang ports-gcc
USE_GMAKE= Yes
BUILD_DEPENDS= devel/boost \
devel/gobject-introspection \
www/py-jinja2${MODPY_FLAVOR}
LIB_DEPENDS= multimedia/gstreamer1/core \
x11/gtk3mm
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic
# c++11
COMPILER= base-clang ports-gcc
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.11
CONFIGURE_ARGS+= --disable-xml \
--disable-pulse \
--enable-dbus
# Someone can add GNOME support later if they like
# (GNOME support requires libpanelapplet)
CONFIGURE_ARGS+= --disable-gnome2 \
--disable-gnome3
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
#CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
# LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
post-patch:
sed -i -e 's/-D_XOPEN_SOURCE=600/-D_XOPEN_SOURCE=700 -D_BSD_SOURCE/' `find ${WRKDIST} -name Makefile.am`
CONFIGURE_ARGS= --disable-gconf \
--disable-xml \
--disable-pulse
# could be enabled if requested (needs testing)
CONFIGURE_ARGS += --disable-gsettings \
--disable-gnome3 \
--disable-indicator \
--disable-xfce \
--disable-mate \
--disable-distribution
# /usr/include/c++/v1/__locale:62:3: error: unknown type name 'locale_t'
pre-configure:
@cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf
find ${WRKDIST} -name Makefile.in -exec \
sed -i 's/-D_XOPEN_SOURCE=600/-D_XOPEN_SOURCE=700 -D_BSD_SOURCE/' '{}' \+
# disabled in CONFIGURE_ARGS
post-install:
rm -rf ${PREFIX}/share/{cinnamon,gnome-shell}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (workrave-1.10.1.tar.gz) = bvia69J44n07c4lkhefYqu9BXn0YMY07t7oNBQe9SN4=
SIZE (workrave-1.10.1.tar.gz) = 6800197
SHA256 (workrave-1.10.44.tar.gz) = aodxBAPKTIjvBRN8yUFLSipRi5Tx8Qfuzfg9veSQujc=
SIZE (workrave-1.10.44.tar.gz) = 6953835

View File

@ -0,0 +1,32 @@
$OpenBSD: patch-common_src_Locale_cc,v 1.1 2021/03/03 09:35:08 ajacoutot Exp $
Locale.cc:269:33: error: use of undeclared identifier '_NL_TIME_FIRST_WEEKDAY'
Index: common/src/Locale.cc
--- common/src/Locale.cc.orig
+++ common/src/Locale.cc
@@ -262,22 +262,8 @@ Locale::get_week_start()
#ifdef PLATFORM_OS_UNIX
union { 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");
-
- week_start = (week_1stday + first_weekday - 1) % 7;
+ langinfo.string = nl_langinfo(DAY_1);
+ week_start = langinfo.string[0];
#endif
return week_start;

View File

@ -0,0 +1,109 @@
$OpenBSD: patch-configure,v 1.8 2021/03/03 09:35:08 ajacoutot Exp $
Fix bashism.
Force GStreamer1.
Index: configure
--- configure.orig
+++ configure
@@ -21001,7 +21001,7 @@ then
loop=${enable_monitors},
- while echo $loop | grep \, &> /dev/null
+ while echo $loop | grep -q \,
do
monitor=${loop%%\,*}
loop=${loop#*\,}
@@ -24756,83 +24756,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
- ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
- ac_status=$?
- $as_echo "$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
- ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
- ac_status=$?
- $as_echo "$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
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
- else
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GSTREAMER_PKG_ERRORS" >&5
-
-
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-else
- GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
- GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- config_gstreamer=yes
-
-$as_echo "#define HAVE_GSTREAMER 1" >>confdefs.h
-
-fi
-
- if test "x$config_gstreamer" != "xyes";
- then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
-$as_echo_n "checking for GSTREAMER... " >&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-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-1.0") 2>&5
ac_status=$?
@@ -24902,7 +24825,6 @@ $as_echo "yes" >&6; }
$as_echo "#define HAVE_GSTREAMER 1" >>confdefs.h
fi
- fi
fi

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2015/10/26 20:24:54 edd Exp $
Bashisms.
--- configure.ac.orig Wed Jun 12 17:40:10 2013
+++ configure.ac Thu Apr 2 21:00:18 2015
@@ -426,11 +426,8 @@ then
loop=${enable_monitors},
- while echo $loop | grep \, &> /dev/null
+ for monitor in `echo ${loop} | sed -e 's/,/ /g'`;
do
- monitor=${loop%%\,*}
- loop=${loop#*\,}
-
case "$monitor" in
record)
if test "x$have_xrecord" != "xyes" ; then

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-frontend_common_src_ScreenLockCommandline_cc,v 1.1 2021/03/03 09:35:08 ajacoutot Exp $
ScreenLockCommandline.cc:70:14: error: use of undeclared identifier 'WEXITSTATUS'
Index: frontend/common/src/ScreenLockCommandline.cc
--- frontend/common/src/ScreenLockCommandline.cc.orig
+++ frontend/common/src/ScreenLockCommandline.cc
@@ -27,6 +27,8 @@
#include <glib.h>
#endif
+#include <sys/wait.h>
+
#include "ScreenLockCommandline.hh"
#include "debug.hh"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-frontend_common_src_System_cc,v 1.2 2010/05/13 12:29:26 jasper Exp $
--- frontend/common/src/System.cc.orig Thu May 28 21:04:02 2009
+++ frontend/common/src/System.cc Thu May 13 13:22:40 2010
@@ -25,6 +25,8 @@
#include <glib.h>
#endif
+#include <sys/wait.h>
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.4 2015/10/26 20:24:54 edd Exp $
--- po/Makefile.in.in.orig Wed Jun 12 17:55:12 2013
+++ po/Makefile.in.in Thu Apr 2 20:40:59 2015
@@ -146,7 +146,7 @@ uninstall:
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
-check: all $(GETTEXT_PACKAGE).pot
+check: all
rm -f missing notexist
srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
if [ -r missing -o -r notexist ]; then \

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-po_pl_po,v 1.1 2015/10/26 20:24:54 edd Exp $
Two line desktop entry confuses update-desktop-database.
--- po/pl.po.orig Fri Apr 3 11:41:48 2015
+++ po/pl.po Fri Apr 3 11:42:41 2015
@@ -904,8 +904,7 @@ msgstr "Opóźnienie trwa:"
msgid ""
"Assists in the prevention and recovery of Repetitive Strain Injury (RSI)"
msgstr ""
-"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia\n"
-"- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję"
+"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia - RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję"
#: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:55
#: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:79

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-po_ru_po,v 1.2 2021/02/26 18:20:36 naddy Exp $
Two line desktop entry confuses update-desktop-database.
--- po/ru.po.orig Fri Apr 3 11:42:48 2015
+++ po/ru.po Fri Apr 3 11:43:12 2015
@@ -760,8 +760,7 @@ msgstr "Расположение в системном
msgid ""
"Assists in the prevention and recovery of Repetitive Strain Injury (RSI)"
msgstr ""
-"Эта программа помогает в предупреждении и лечении туннельного синдрома\n "
-"запястья и снятии общего мышечного напряжения."
+"Эта программа помогает в предупреждении и лечении туннельного синдрома запястья и снятии общего мышечного напряжения."
#: ../frontend/gtkmm/src/gnome_applet/GNOME_WorkraveApplet.xml.in.h:1
#: ../frontend/gtkmm/src/gnome_applet3/WorkraveApplet.c:874

View File

@ -1,7 +1,4 @@
Workrave is a program that assists in the recovery and prevention of
Repetitive Strain Injury (RSI). The program frequently alerts you to
take micro-pauses, rest breaks and restricts you to your daily limit.
These can be customized and it stops the counter when you stop. The
program can be run distributed on one or more PCs. All connected PCs
share the same timing information. When you switch computers, you will
still be asked to pause on time.
Workrave is a free program that assists in the recovery and prevention of
Repetitive Strain Injury (RSI). It monitors your keyboard and mouse usage and
using this information, it frequently alerts you to take microbreaks, rest
breaks and restricts you to your daily computer usage.

View File

@ -1,18 +1,12 @@
@comment $OpenBSD: PLIST,v 1.11 2018/06/29 22:16:20 espie Exp $
@comment $OpenBSD: PLIST,v 1.12 2021/03/03 09:35:08 ajacoutot Exp $
@bin bin/workrave
lib/girepository-1.0/Workrave-1.0.typelib
lib/libworkrave-private-1.0.a
@static-lib lib/libworkrave-private-1.0.a
lib/libworkrave-private-1.0.la
@lib lib/libworkrave-private-1.0.so.${LIBworkrave-private-1.0_VERSION}
share/applications/workrave.desktop
share/dbus-1/services/org.workrave.Workrave.service
share/gir-1.0/Workrave-1.0.gir
@comment share/gnome-shell/
@comment share/gnome-shell/extensions/
@comment share/gnome-shell/extensions/workrave@workrave.org/
@comment share/gnome-shell/extensions/workrave@workrave.org/extension.js
@comment share/gnome-shell/extensions/workrave@workrave.org/metadata.json
@comment share/gnome-shell/extensions/workrave@workrave.org/stylesheet.css
share/icons/hicolor/128x128/apps/workrave.png
share/icons/hicolor/16x16/apps/workrave.png
share/icons/hicolor/24x24/apps/workrave.png
@ -39,6 +33,7 @@ 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
@ -46,6 +41,7 @@ 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
@ -58,6 +54,8 @@ 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/
share/metainfo/workrave.appdata.xml
share/sounds/
share/sounds/workrave/
share/sounds/workrave/default/