Date: Thu, 4 Aug 2016 19:06:01 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419649 - in head/x11/workrave: . files Message-ID: <201608041906.u74J618u067209@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Thu Aug 4 19:06:00 2016 New Revision: 419649 URL: https://svnweb.freebsd.org/changeset/ports/419649 Log: x11/workrave: 1.10.1 -> 1.10.15 - Switch to Gtkmm 3.0 - Switch to GitHub - Take maintainership - Move sound output to external script and remove PULSEAUDIO and GSTREAMER options keeping dependencies small - See URL for changes since 1.10.1 - submitter becomes maintainer No GNOME/XFCE/Cinnamon applets are build atm. Submitter does not use them so can't test them and has not added support for them. If someone wants them please submit patches. The trayicon works fine. PR: 211297 Submitted by: Tobias Kortkamp <t@tobik.me> Added: head/x11/workrave/files/patch-backend_include_ICore.hh - copied, changed from r419648, head/x11/workrave/files/patch-backend__include__ICore.hh head/x11/workrave/files/patch-common_src_Locale.cc (contents, props changed) head/x11/workrave/files/patch-configure.ac (contents, props changed) head/x11/workrave/files/patch-frontend_common_src_ScreenLockCommandline.cc (contents, props changed) Deleted: head/x11/workrave/files/patch-System.cc head/x11/workrave/files/patch-backend__include__ICore.hh head/x11/workrave/files/patch-backends__src__unix__Makefile.in head/x11/workrave/files/patch-configure head/x11/workrave/files/patch-frontend__common__src__Makefile.in Modified: head/x11/workrave/Makefile head/x11/workrave/distinfo head/x11/workrave/pkg-descr head/x11/workrave/pkg-plist Modified: head/x11/workrave/Makefile ============================================================================== --- head/x11/workrave/Makefile Thu Aug 4 18:49:48 2016 (r419648) +++ head/x11/workrave/Makefile Thu Aug 4 19:06:00 2016 (r419649) @@ -2,46 +2,67 @@ # $FreeBSD$ PORTNAME= workrave -PORTVERSION= 1.10.1 -PORTREVISION= 2 -CATEGORIES= x11 gnome -MASTER_SITES= SF +PORTVERSION= 1.10.15 +CATEGORIES= x11 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= t@tobik.me COMMENT= RSI prevention tool LICENSE= GPLv3+ -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah LIB_DEPENDS= libgdome.so:textproc/gdome2 -USES= gettext gmake pathfix pkgconfig python:2.7 -USE_XORG= recordproto x11 xext xmu xscrnsaver xtst -USE_GNOME= intlhack gconf2 gtkmm24 +USES= autoreconf:build gettext gmake libtool pathfix pkgconfig +USE_XORG= ice recordproto sm x11 xext xmu xscrnsaver xtst +USE_GNOME= intltool intlhack introspection gtkmm30 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-silent-rules --enable-gconf --disable-gnome3 \ +CONFIGURE_ARGS= --disable-silent-rules \ + --disable-gsettings \ + --disable-pulse \ + --disable-gconf \ + --disable-mate \ + --disable-gnome2 \ + --disable-gnome3 \ + --disable-xfce \ --disable-indicator INSTALLS_ICONS= yes +USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib +USE_GITHUB= yes +GH_ACCOUNT= rcaelers +GH_TAGNAME= v${PORTVERSION:S/./_/g} -OPTIONS_DEFINE= GNOME GSTREAMER PULSEAUDIO -OPTIONS_DEFAULT= GSTREAMER +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +INSTALL_TARGET= install-strip + +OPTIONS_DEFINE= DBUS DISTRIBUTION GSTREAMER +OPTIONS_DEFAULT= DBUS GSTREAMER OPTIONS_SUB= yes -GNOME_USE= gnome=gnomepanel -GNOME_LIB_DEPENDS= libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26 -GNOME_CONFIGURE_ENABLE= gnome2 -GSTREAMER_USE= gstreamer=good +DISTRIBUTION_DESC= Build with networking support + +DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah +DBUS_CONFIGURE_ENABLE= dbus +DBUS_USES= python:2.7 + +DISTRIBUTION_CONFIGURE_ENABLE= distribution + +GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 GSTREAMER_CONFIGURE_ENABLE= gstreamer -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_ENABLE= pulse +GSTREAMER_USE= gstreamer1=good +# Remove gnome-shell cinnamon subdirs from build, so it doesn't install +# unused files post-patch: - @${REINPLACE_CMD} -e \ - '/if test/s|==|=|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's| gnome-shell$$||' ${WRKSRC}/frontend/applets/Makefile.in + @${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 <bsd.port.mk> Modified: head/x11/workrave/distinfo ============================================================================== --- head/x11/workrave/distinfo Thu Aug 4 18:49:48 2016 (r419648) +++ head/x11/workrave/distinfo Thu Aug 4 19:06:00 2016 (r419649) @@ -1,2 +1,3 @@ -SHA256 (workrave-1.10.1.tar.gz) = 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de -SIZE (workrave-1.10.1.tar.gz) = 6800197 +TIMESTAMP = 1469179894 +SHA256 (rcaelers-workrave-1.10.15-v1_10_15_GH0.tar.gz) = fa05bedbb32baae9d22ef2b1ac25e90bc9f1363ce588b396190b0240559f471c +SIZE (rcaelers-workrave-1.10.15-v1_10_15_GH0.tar.gz) = 6375380 Copied and modified: head/x11/workrave/files/patch-backend_include_ICore.hh (from r419648, head/x11/workrave/files/patch-backend__include__ICore.hh) ============================================================================== --- head/x11/workrave/files/patch-backend__include__ICore.hh Thu Aug 4 18:49:48 2016 (r419648, copy source) +++ head/x11/workrave/files/patch-backend_include_ICore.hh Thu Aug 4 19:06:00 2016 (r419649) @@ -1,5 +1,6 @@ ---- backend/include/ICore.hh.orig 2010-12-05 21:01:31.000000000 +0300 -+++ backend/include/ICore.hh 2014-05-17 03:18:53.674936521 +0400 +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 @@ -21,6 +21,7 @@ #define ICORE_HH Added: head/x11/workrave/files/patch-common_src_Locale.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/workrave/files/patch-common_src_Locale.cc Thu Aug 4 19:06:00 2016 (r419649) @@ -0,0 +1,27 @@ +--- common/src/Locale.cc.orig 2016-05-11 16:14:20 UTC ++++ common/src/Locale.cc +@@ -258,22 +258,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; Added: head/x11/workrave/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/workrave/files/patch-configure.ac Thu Aug 4 19:06:00 2016 (r419649) @@ -0,0 +1,97 @@ +--- 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 + + Added: head/x11/workrave/files/patch-frontend_common_src_ScreenLockCommandline.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/workrave/files/patch-frontend_common_src_ScreenLockCommandline.cc Thu Aug 4 19:06:00 2016 (r419649) @@ -0,0 +1,11 @@ +--- frontend/common/src/ScreenLockCommandline.cc.orig 2016-05-11 16:14:20 UTC ++++ frontend/common/src/ScreenLockCommandline.cc +@@ -27,6 +27,8 @@ + #include <glib.h> + #endif + ++#include <sys/wait.h> ++ + #include "ScreenLockCommandline.hh" + #include "debug.hh" + Modified: head/x11/workrave/pkg-descr ============================================================================== --- head/x11/workrave/pkg-descr Thu Aug 4 18:49:48 2016 (r419648) +++ head/x11/workrave/pkg-descr Thu Aug 4 19:06:00 2016 (r419649) @@ -1,10 +1,6 @@ Workrave is a program that assists in the recovery and prevention of -Repetitive Strain Injury (RSI). The program frequently alerts you to +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. - WWW: http://www.workrave.org/ Modified: head/x11/workrave/pkg-plist ============================================================================== --- head/x11/workrave/pkg-plist Thu Aug 4 18:49:48 2016 (r419648) +++ head/x11/workrave/pkg-plist Thu Aug 4 19:06:00 2016 (r419649) @@ -1,9 +1,13 @@ -%%NO_GNOME%%bin/workrave -%%GNOME%%libdata/bonobo/servers/Workrave-Applet.server -%%GNOME%%libexec/workrave-applet -%%NO_GNOME%%share/applications/workrave.desktop -%%NO_GNOME%%share/dbus-1/services/org.workrave.Workrave.service -%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608041906.u74J618u067209>