Index: head/x11/workrave/Makefile =================================================================== --- head/x11/workrave/Makefile (revision 527995) +++ head/x11/workrave/Makefile (revision 527996) @@ -1,67 +1,50 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= workrave -DISTVERSIONPREFIX= v -DISTVERSION= 1_10_16 -PORTREVISION= 6 +PORTVERSION= 1.10.34 CATEGORIES= x11 +MASTER_SITES= https://github.com/rcaelers/workrave/releases/download/v${PORTVERSION:S/./_/g}/ MAINTAINER= tobik@FreeBSD.org COMMENT= RSI prevention tool LICENSE= GPLv3+ LIB_DEPENDS= libgdome.so:textproc/gdome2 -USES= autoreconf:build compiler:c++11-lang gettext gmake gnome \ - libtool localbase pathfix pkgconfig xorg +USES= compiler:c++11-lang gettext gmake gnome libtool localbase \ + pkgconfig xorg USE_CXXSTD= c++11 -USE_XORG= ice xorgproto sm x11 xext xmu xscrnsaver xtst -USE_GNOME= intltool intlhack introspection gtkmm30 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-gsettings \ - --disable-pulse \ - --disable-gconf \ - --disable-mate \ - --disable-gnome2 \ - --disable-gnome3 \ - --disable-xfce \ - --disable-indicator +USE_GNOME= gtkmm30 intlhack intltool introspection:build INSTALLS_ICONS= yes USE_LDCONFIG= yes +USE_XORG= ice sm x11 xext xmu xorgproto xscrnsaver xtst -USE_GITHUB= yes -GH_ACCOUNT= rcaelers - +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 OPTIONS_DEFAULT= DBUS GSTREAMER OPTIONS_SUB= yes DISTRIBUTION_DESC= Build with networking support -DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} +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 -DBUS_USES= python:2.7 DISTRIBUTION_CONFIGURE_ENABLE= distribution -GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 +GSTREAMER_USE= GSTREAMER1=good GSTREAMER_CONFIGURE_ENABLE= gstreamer -GSTREAMER_USE= gstreamer1=good - -# Remove gnome-shell cinnamon subdirs from build, so it doesn't install -# unused files -post-patch: - @${REINPLACE_CMD} -e 's| gnome-shell cinnamon | |' \ - ${WRKSRC}/frontend/applets/Makefile.am - -# Run bundled autogen.sh instead of relying on USES=autoreconf which -# leads to errors like -# config.status: error: po/Makefile.in.in was not created by intltoolize. -pre-configure: - @cd ${WRKSRC} && ./autogen.sh .include Index: head/x11/workrave/distinfo =================================================================== --- head/x11/workrave/distinfo (revision 527995) +++ head/x11/workrave/distinfo (revision 527996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484927911 -SHA256 (rcaelers-workrave-v1_10_16_GH0.tar.gz) = 4368306db0d06e76a3a90fc8e81b3648c1218259833b01cdc6899b1e98e5895c -SIZE (rcaelers-workrave-v1_10_16_GH0.tar.gz) = 6375438 +TIMESTAMP = 1583350507 +SHA256 (workrave-1.10.34.tar.gz) = 3a178b21bd729e63aedb78188de86e536dc3626bea62ee47af2ba234f13b58e7 +SIZE (workrave-1.10.34.tar.gz) = 6953937 Index: head/x11/workrave/files/patch-configure.ac =================================================================== --- head/x11/workrave/files/patch-configure.ac (revision 527995) +++ head/x11/workrave/files/patch-configure.ac (nonexistent) @@ -1,97 +0,0 @@ ---- configure.ac.orig 2016-05-11 16:14:20 UTC -+++ configure.ac -@@ -417,8 +417,7 @@ then - with_cxx11=no - # Enable C++11 std if gtkmm >= 3.18.0 - PKG_CHECK_MODULES(GTKMM, gtkmm-3.0 >= 3.18.0, -- [ AX_CXX_COMPILE_STDCXX_11([noext]) -- with_cxx11=yes -+ [ with_cxx11=yes - ], - [] - ) -@@ -447,36 +446,6 @@ then - enable_monitors="${enable_monitors}x11events" - fi - -- loop=${enable_monitors}, -- -- while echo $loop | grep \, &> /dev/null -- do -- monitor=${loop%%\,*} -- loop=${loop#*\,} -- -- case "$monitor" in -- record) -- if test "x$have_xrecord" != "xyes" ; then -- AC_MSG_ERROR([record activity monitor not supported.]) -- fi -- ;; -- -- x11events) -- ;; -- -- screensaver) -- if test "x$have_xscreensaver" != "xyes" ; then -- AC_MSG_ERROR([screensaver activity monitor not supported.]) -- fi -- ;; -- -- *) -- AC_MSG_ERROR([unknown activity monitor: $monitor]) -- ;; -- -- esac -- done -- - AC_DEFINE_UNQUOTED(HAVE_MONITORS, "$enable_monitors", "Enabled activity monitors") - - fi -@@ -815,21 +784,11 @@ dnl - dnl GConf - dnl - -+dnl Do not want - config_gconf=no -- --if test "x$enable_gconf" != "xno" -a "x$config_gnome3" != "xyes" --then -- PKG_CHECK_MODULES([GCONF], -- [gconf-2.0 >= 2.31.1], -- [config_gconf=yes -- AC_DEFINE([HAVE_GCONF], , [Define if GConf is available])], -- [if test "x$enable_gconf" = "xyes"; then -- AC_MSG_ERROR([GConf development headers not found.]) -- fi]) --fi -- --AM_CONDITIONAL(HAVE_GCONF, test "x$config_gconf" = "xyes") -- -+AC_SUBST([GCONF_CFLAGS], []) -+AC_SUBST([GCONF_LIBS], []) -+AM_CONDITIONAL(HAVE_GCONF, false) - - dnl - dnl XML -@@ -892,13 +851,6 @@ config_gstreamer=no - - if test "x$enable_gstreamer" != "xno"; - then -- PKG_CHECK_MODULES([GSTREAMER], -- [gstreamer-0.10], -- [config_gstreamer=yes -- AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ]) -- -- if test "x$config_gstreamer" != "xyes"; -- then - PKG_CHECK_MODULES([GSTREAMER], - [gstreamer-1.0], - [config_gstreamer=yes -@@ -906,7 +858,6 @@ then - [if test "x$enable_gstreamer" = "xyes"; then - AC_MSG_ERROR([GStreamer development headers not found.]) - fi]) -- fi - fi - - Property changes on: head/x11/workrave/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/workrave/files/patch-configure =================================================================== --- head/x11/workrave/files/patch-configure (nonexistent) +++ head/x11/workrave/files/patch-configure (revision 527996) @@ -0,0 +1,59 @@ +Fix bashism and force GStreamer 1.x support + +--- configure.orig 2020-03-08 02:42:31 UTC ++++ configure +@@ -20993,7 +20993,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 + 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; } +- +-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 + + + Property changes on: head/x11/workrave/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/workrave/files/patch-frontend_applets_Makefile.in =================================================================== --- head/x11/workrave/files/patch-frontend_applets_Makefile.in (nonexistent) +++ head/x11/workrave/files/patch-frontend_applets_Makefile.in (revision 527996) @@ -0,0 +1,11 @@ +--- frontend/applets/Makefile.in.orig 2020-03-04 20:08:42 UTC ++++ frontend/applets/Makefile.in +@@ -438,7 +438,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 xfce mate + all: all-recursive + + .SUFFIXES: Property changes on: head/x11/workrave/files/patch-frontend_applets_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/workrave/pkg-plist =================================================================== --- head/x11/workrave/pkg-plist (revision 527995) +++ head/x11/workrave/pkg-plist (revision 527996) @@ -1,118 +1,118 @@ 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/appdata/workrave.appdata.xml 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/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_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/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.png %%DATADIR%%/images/timer-micro-break.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