On Sun, Oct 25, 2015 at 07:38:05PM +0100, Antoine Jacoutot wrote: > Dunno, it still does not apply here, but if it does for others, that's fine.
FWIW, I'm applying like this: patch -Ep0 < /path/to/patch My LC_CTYPE is en_US.UTF-8. Since the failing hunk has Russian characters, I'm willing to bet it's something to do with that. I've attached the diff instead on inlining it, in case vim is the source of the error (I inline diffs into mails using :r/path/to/patch in vim). > It needs devel/gobject-introspection as a build_depends. Fixed. > Please keep it as it was. I've seen several ports catch up on the c++11 needs > and have their configure script automatically append it if needed. > There's a good chance it'll be fixed at some point and we don't need to pass > -std=c++11 twice. Fixed. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Index: Makefile =================================================================== RCS file: /home/edd/cvsync/ports/productivity/workrave/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile 24 Sep 2015 10:36:27 -0000 1.41 +++ Makefile 25 Oct 2015 19:22:21 -0000 @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.41 2015/09/24 10:36:27 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.38 2015/03/27 08:14:14 ajacoutot Exp $ # XXX check if still needed at next update CXXFLAGS += -std=c++11 COMMENT= reminder program for prevention of RSI -DISTNAME= workrave-1.9.4 -REVISION= 11 +DISTNAME= workrave-1.10.1 CATEGORIES= productivity x11 HOMEPAGE= http://www.workrave.org/ @@ -14,31 +13,38 @@ HOMEPAGE= http://www.workrave.org/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender Xtst atk-1.0 atkmm-1.6 c cairo cairomm-1.0 -WANTLIB += dbus-1 dbus-glib-1 expat ffi fontconfig freetype gconf-2 -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 -WANTLIB += glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 -WANTLIB += gstreamer-0.10 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 harfbuzz -WANTLIB += lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre -WANTLIB += pixman-1 png pthread pthread-stubs sigc-2.0 xcb -WANTLIB += xcb-render xcb-shm xml2 z +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 lzma m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1 +WANTLIB += png pthread pthread-stubs sigc-2.0 xcb xcb-render +WANTLIB += xcb-shm xml2 z + +SHARED_LIBS += workrave-private-1.0 0.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=workrave/} -BUILD_DEPENDS= devel/py-cheetah +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/gtk2mm>=2.24.4 + x11/gtk3mm MODULES= devel/gettext \ lang/python \ textproc/intltool -# c++11 +# c++11 (although only for building against libsigc++) MODULES += gcc4 MODGCC4_ARCHS= * MODGCC4_LANGS= c++ @@ -46,22 +52,21 @@ MODGCC4_LANGS= c++ USE_GMAKE= Yes CONFIGURE_STYLE= gnu +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.11 CONFIGURE_ARGS+= --disable-xml \ --disable-pulse \ --enable-dbus -# XXX: Disabled for now as workrave isn't ported to libpanel-applet-4.0 yet -CONFIGURE_ARGS+= --disable-gnome +# 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" pre-configure: - ${SUBST_CMD} ${WRKSRC}/frontend/gtkmm/src/Makefile.in \ - ${WRKSRC}/frontend/gtkmm/src/gnome_applet/Makefile.in - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/workrave/sound/events - ${INSTALL_DATA} ${WRKSRC}/frontend/common/share/sounds/workrave.soundlist \ - ${PREFIX}/share/examples/workrave/sound/events + @cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/edd/cvsync/ports/productivity/workrave/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 18 Jan 2015 03:15:00 -0000 1.6 +++ distinfo 6 Sep 2015 10:17:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (workrave-1.9.4.tar.gz) = zh76V6NxkgKcTcvooKwriTsihsQoKPGbD7hoZ8u83ho= -SIZE (workrave-1.9.4.tar.gz) = 6748495 +SHA256 (workrave-1.10.1.tar.gz) = bvia69J44n07c4lkhefYqu9BXn0YMY07t7oNBQe9SN4= +SIZE (workrave-1.10.1.tar.gz) = 6800197 Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_ac 6 Sep 2015 10:17:25 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +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 Index: patches/patch-frontend_common_share_sounds_Makefile_in =================================================================== RCS file: patches/patch-frontend_common_share_sounds_Makefile_in diff -N patches/patch-frontend_common_share_sounds_Makefile_in --- patches/patch-frontend_common_share_sounds_Makefile_in 16 Jan 2011 20:34:40 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-frontend_common_share_sounds_Makefile_in,v 1.4 2011/01/16 20:34:40 ajacoutot Exp $ ---- frontend/common/share/sounds/Makefile.in.orig Sat Dec 11 18:05:21 2010 -+++ frontend/common/share/sounds/Makefile.in Sat Jan 15 00:00:35 2011 -@@ -549,17 +549,6 @@ uninstall-rcDATA: - echo " ( cd '$(DESTDIR)$(rcdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(rcdir)" && rm -f $$files - install-utilsDATA: $(utils_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(utilsdir)" || $(MKDIR_P) "$(DESTDIR)$(utilsdir)" -- @list='$(utils_DATA)'; test -n "$(utilsdir)" || list=; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utilsdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(utilsdir)" || exit $$?; \ -- done - - uninstall-utilsDATA: - @$(NORMAL_UNINSTALL) -@@ -767,7 +756,7 @@ check: check-recursive - all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(kdesoundsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(utilsdir)"; do \ -+ for dir in "$(DESTDIR)$(kdesoundsdir)" "$(DESTDIR)$(rcdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive Index: patches/patch-frontend_gtkmm_src_Makefile_in =================================================================== RCS file: patches/patch-frontend_gtkmm_src_Makefile_in diff -N patches/patch-frontend_gtkmm_src_Makefile_in --- patches/patch-frontend_gtkmm_src_Makefile_in 13 Sep 2011 07:50:51 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-frontend_gtkmm_src_Makefile_in,v 1.3 2011/09/13 07:50:51 jasper Exp $ ---- frontend/gtkmm/src/Makefile.in.orig Tue Sep 13 09:27:54 2011 -+++ frontend/gtkmm/src/Makefile.in Tue Sep 13 09:28:20 2011 -@@ -2142,7 +2142,7 @@ resource.rc: resource.rc.in - @HAVE_PYTHON_CHEETAH_TRUE@ $(top_srcdir)/common/bin/dbusgen.py \ - @HAVE_PYTHON_CHEETAH_TRUE@ $(top_srcdir)/common/bin/DBus-client-template.cc \ - @HAVE_PYTHON_CHEETAH_TRUE@ $(top_srcdir)/common/bin/DBus-client-template.hh --@HAVE_PYTHON_CHEETAH_TRUE@ python $(top_srcdir)/common/bin/dbusgen.py --language=C++ -c $(srcdir)/gnome_applet/gnome-applet.xml DBUSGnomeApplet -+@HAVE_PYTHON_CHEETAH_TRUE@ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=C++ -c $(srcdir)/gnome_applet/gnome-applet.xml DBUSGnomeApplet - - DBusGnomeApplet.hh: DBusGnomeApplet.cc - GnomeAppletWindow.cc: DBusGnomeApplet.hh -@@ -2165,7 +2165,7 @@ GnomeAppletWindow.cc: DBusGnomeApplet.hh - @HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@@HAVE_PYTHON_CHEETAH_TRUE@ $(top_srcdir)/common/bin/dbusgen.py \ - @HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@@HAVE_PYTHON_CHEETAH_TRUE@ $(top_srcdir)/common/bin/DBus-template.cc \ - @HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@@HAVE_PYTHON_CHEETAH_TRUE@ $(top_srcdir)/common/bin/DBus-template.hh --@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@@HAVE_PYTHON_CHEETAH_TRUE@ python $(top_srcdir)/common/bin/dbusgen.py --language=C++ -s $(srcdir)/workrave-gui.xml DBusGUI -+@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@@HAVE_PYTHON_CHEETAH_TRUE@ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=C++ -s $(srcdir)/workrave-gui.xml DBusGUI - - @HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@@[email protected]: DBusGUI.cc ; test -f $@ - Index: patches/patch-frontend_gtkmm_src_gnome_applet_Makefile_in =================================================================== RCS file: patches/patch-frontend_gtkmm_src_gnome_applet_Makefile_in diff -N patches/patch-frontend_gtkmm_src_gnome_applet_Makefile_in --- patches/patch-frontend_gtkmm_src_gnome_applet_Makefile_in 13 Sep 2011 07:50:51 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-frontend_gtkmm_src_gnome_applet_Makefile_in,v 1.4 2011/09/13 07:50:51 jasper Exp $ ---- frontend/gtkmm/src/gnome_applet/Makefile.in.orig Tue Sep 13 09:28:42 2011 -+++ frontend/gtkmm/src/gnome_applet/Makefile.in Tue Sep 13 09:28:51 2011 -@@ -1027,10 +1027,10 @@ uninstall-am: uninstall-libexecPROGRAMS uninstall-serv - @HAVE_GNOMEAPPLET_TRUE@@HAVE_PANELAPPLET3_FALSE@ dbus-binding-tool --prefix=workrave --mode=glib-client $<> $@ - - @[email protected]: $(top_srcdir)/frontend/gtkmm/src/workrave-gui.xml --@HAVE_PYTHON_CHEETAH_TRUE@ python $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib $(srcdir)/../workrave-gui.xml DBusGUI -+@HAVE_PYTHON_CHEETAH_TRUE@ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib $(srcdir)/../workrave-gui.xml DBusGUI - - @[email protected]: gnome-applet.xml --@HAVE_PYTHON_CHEETAH_TRUE@ python $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib $(srcdir)/gnome-applet.xml DBusGnomeApplet -+@HAVE_PYTHON_CHEETAH_TRUE@ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib $(srcdir)/gnome-applet.xml DBusGnomeApplet - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: patches/patch-po_Makefile_in_in =================================================================== RCS file: /home/edd/cvsync/ports/productivity/workrave/patches/patch-po_Makefile_in_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-po_Makefile_in_in --- patches/patch-po_Makefile_in_in 13 May 2010 12:29:26 -0000 1.3 +++ patches/patch-po_Makefile_in_in 6 Sep 2015 10:17:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.3 2010/05/13 12:29:26 jasper Exp $ ---- po/Makefile.in.in.orig Sun Oct 25 12:14:51 2009 -+++ po/Makefile.in.in Thu May 13 13:22:40 2010 -@@ -141,7 +141,7 @@ uninstall: +--- 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 Index: patches/patch-po_pl_po =================================================================== RCS file: patches/patch-po_pl_po diff -N patches/patch-po_pl_po --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-po_pl_po 6 Sep 2015 10:17:25 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +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 Index: patches/patch-po_ru_po =================================================================== RCS file: patches/patch-po_ru_po diff -N patches/patch-po_ru_po --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-po_ru_po 6 Sep 2015 10:17:25 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +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 Index: pkg/PLIST =================================================================== RCS file: /home/edd/cvsync/ports/productivity/workrave/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 20 Aug 2013 22:05:58 -0000 1.8 +++ pkg/PLIST 25 Oct 2015 15:47:19 -0000 @@ -1,16 +1,27 @@ @comment $OpenBSD: PLIST,v 1.8 2013/08/20 22:05:58 zhuk Exp $ @bin bin/workrave +lib/girepository-1.0/Workrave-1.0.typelib +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/examples/workrave/ -share/examples/workrave/sound/ -@sample ${SYSCONFDIR}/sound/ -share/examples/workrave/sound/events/ -@sample ${SYSCONFDIR}/sound/events/ -share/examples/workrave/sound/events/workrave.soundlist -@sample ${SYSCONFDIR}/sound/events/workrave.soundlist -share/icons/hicolor/48x48/apps/workrave-icon-huge.png -share/icons/hicolor/scalable/apps/workrave-sheep.svg +share/gir-1.0/Workrave-1.0.gir +@comment share/gnome-shell/ +@comment share/gnome-shell/extensions/ +@comment share/gnome-shell/extensions/[email protected]/ +@comment share/gnome-shell/extensions/[email protected]/extension.js +@comment share/gnome-shell/extensions/[email protected]/metadata.json +@comment share/gnome-shell/extensions/[email protected]/stylesheet.css +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 @@ -21,9 +32,12 @@ 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 @@ -37,11 +51,14 @@ 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/sounds/ share/sounds/workrave/ share/sounds/workrave/default/ share/sounds/workrave/default/break-ignored.wav @@ -106,10 +123,7 @@ share/workrave/images/time.png share/workrave/images/timer-daily.png share/workrave/images/timer-micro-break.png share/workrave/images/timer-rest-break.png -share/workrave/images/workrave-icon-huge.png -share/workrave/images/workrave-icon-large.png share/workrave/images/workrave-icon-medium.png -share/workrave/images/workrave-icon-small.png share/workrave/images/workrave-quiet-icon-medium.png share/workrave/images/workrave-suspended-icon-medium.png share/workrave/images/workrave.png
