Index: head/deskutils/easystroke/Makefile =================================================================== --- head/deskutils/easystroke/Makefile (revision 442111) +++ head/deskutils/easystroke/Makefile (revision 442112) @@ -1,51 +1,51 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= easystroke PORTVERSION= 0.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Easystroke is a gesture-recognition application for X11 LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build - BUILD_DEPENDS= help2man:misc/help2man \ ${LOCALBASE}/include/xorg/xserver-properties.h:x11-servers/xorg-server -LIB_DEPENDS= libgtkmm-3.0.so:x11-toolkits/gtkmm30 \ +LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libboost_serialization.so:devel/boost-libs -USE_XORG= x11 xtst -USES= gettext gmake pkgconfig +USE_GNOME= gtkmm30 +USE_XORG= x11 xext xfixes xi xtst +USES= compiler:c++11-lang gettext gmake pkgconfig +USE_CXXSTD= c++11 INSTALLS_ICONS= yes OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_BUILD_DEPENDS= intltool-merge:textproc/intltool NLS_ALL_TARGET= easystroke.desktop all man # This builds easystroke without translations NLS_ALL_TARGET_OFF= man # Create a .desktop file without translations. # It's usually created by intltool-merge during the build. pre-build-NLS-off: @${CP} ${WRKSRC}/${PORTNAME}.desktop.in ${WRKSRC}/${PORTNAME}.desktop do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 do-install-NLS-on: (cd ${WRKSRC}/po/ && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/locale/ "-name *.mo") .include Index: head/deskutils/easystroke/files/patch-Makefile =================================================================== --- head/deskutils/easystroke/files/patch-Makefile (revision 442111) +++ head/deskutils/easystroke/files/patch-Makefile (revision 442112) @@ -1,14 +1,38 @@ ---- Makefile.orig 2013-05-18 19:53:39.780480687 +0200 -+++ Makefile 2013-05-18 19:54:36.579483230 +0200 -@@ -82,9 +82,9 @@ +--- Makefile.orig 2013-03-27 15:52:38 UTC ++++ Makefile +@@ -12,19 +12,15 @@ + # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-DESTDIR = +-PREFIX = /usr/local + BINDIR = $(PREFIX)/bin + ICONDIR = $(PREFIX)/share/icons/hicolor/scalable/apps + MENUDIR = $(PREFIX)/share/applications + LOCALEDIR= $(PREFIX)/share/locale + DFLAGS = +-OFLAGS = -O2 +-AOFLAGS = -O3 +-STROKEFLAGS = -Wall -std=c99 $(DFLAGS) +-CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags` +-CFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"' +-LDFLAGS = $(DFLAGS) ++STROKEFLAGS = -Wall -std=c99 $(CFLAGS) ++CXXFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags` ++CFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"' ++LDFLAGS += $(DFLAGS) + + LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs` + +@@ -82,9 +78,9 @@ gui.c: gui.glade easystroke.desktop: easystroke.desktop.in $(MOFILES) intltool-merge po/ -d -u $< $@ -desktop.c: easystroke.desktop +desktop.c: echo "const char *desktop_file = \"\\" > $@ - sed 's/Exec=easystroke/Exec=%1$$s/' $< | sed 's/"/\\"/g' | sed 's/.*/&\\n\\/' >> $@ + sed 's/Exec=easystroke/Exec=%1$$s/' easystroke.desktop | sed 's/"/\\"/g' | sed 's/.*/&\\n\\/' >> $@ echo "\";" >> $@ po/POTFILES.in: $(CCFILES) $(HFILES) Index: head/deskutils/easystroke/files/patch-actions.cc =================================================================== --- head/deskutils/easystroke/files/patch-actions.cc (nonexistent) +++ head/deskutils/easystroke/files/patch-actions.cc (revision 442112) @@ -0,0 +1,18 @@ +Fix build with libsigc++ 2.4+ (group was removed). + +https://aur.archlinux.org/cgit/aur.git/commit/sigc.patch?h=easystroke-git&id=3d16f0584c8cf0ade6c181cb56c12d7abe2e17b7 + +--- actions.cc.orig 2013-03-27 15:52:38 UTC ++++ actions.cc +@@ -51,10 +51,8 @@ void TreeViewMulti::on_drag_begin(const Glib::RefPtrset_icon(pb, pb->get_width(), pb->get_height()); + } + +-bool negate(bool b) { return !b; } +- + TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) { +- get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending))); ++ get_selection()->set_select_function(sigc::mem_fun(*this, &TreeViewMulti::negate_pending)); + } + + enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC }; Property changes on: head/deskutils/easystroke/files/patch-actions.cc ___________________________________________________________________ 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/deskutils/easystroke/files/patch-actions.h =================================================================== --- head/deskutils/easystroke/files/patch-actions.h (nonexistent) +++ head/deskutils/easystroke/files/patch-actions.h (revision 442112) @@ -0,0 +1,18 @@ +Fix build with libsigc++ 2.4+ (group was removed). + +https://aur.archlinux.org/cgit/aur.git/commit/sigc.patch?h=easystroke-git&id=3d16f0584c8cf0ade6c181cb56c12d7abe2e17b7 + +--- actions.h.orig 2013-03-27 15:52:38 UTC ++++ actions.h +@@ -31,6 +31,11 @@ class TreeViewMulti : public Gtk::TreeView { + virtual void on_drag_begin(const Glib::RefPtr &context); + public: + TreeViewMulti(); ++ bool negate_pending(const Glib::RefPtr& model, ++ const Gtk::TreeModel::Path& path, ++ bool path_currently_selected) { ++ return !pending; ++ } + }; + + class Actions { Property changes on: head/deskutils/easystroke/files/patch-actions.h ___________________________________________________________________ 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/deskutils/easystroke/files/patch-handler.cc =================================================================== --- head/deskutils/easystroke/files/patch-handler.cc (revision 442111) +++ head/deskutils/easystroke/files/patch-handler.cc (revision 442112) @@ -1,11 +1,11 @@ --- handler.cc.orig 2013-03-27 15:52:38 UTC +++ handler.cc -@@ -533,8 +533,6 @@ public: +@@ -533,8 +533,6 @@ class WaitForPongHandler : public Handler, protected T virtual Grabber::State grab_mode() { return parent->grab_mode(); } }; -static inline float abs(float x) { return x > 0 ? x : -x; } - class AbstractScrollHandler : public Handler { bool have_x, have_y; float last_x, last_y;