Page MenuHomeFreeBSD
Files F106145756

D10815.diff
No OneTemporary
Actions

D10815.diff
View Options

Index: head/deskutils/easystroke/Makefile
===================================================================
--- head/deskutils/easystroke/Makefile
+++ head/deskutils/easystroke/Makefile
@@ -3,7 +3,7 @@
PORTNAME= easystroke
PORTVERSION= 0.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils
MASTER_SITES= SF
@@ -13,16 +13,16 @@
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
Index: head/deskutils/easystroke/files/patch-Makefile
===================================================================
--- head/deskutils/easystroke/files/patch-Makefile
+++ head/deskutils/easystroke/files/patch-Makefile
@@ -1,6 +1,30 @@
---- 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 $< $@
Index: head/deskutils/easystroke/files/patch-actions.h
===================================================================
--- head/deskutils/easystroke/files/patch-actions.h
+++ head/deskutils/easystroke/files/patch-actions.h
@@ -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<Gdk::DragContext> &context);
+ public:
+ TreeViewMulti();
++ bool negate_pending(const Glib::RefPtr<Gtk::TreeModel>& model,
++ const Gtk::TreeModel::Path& path,
++ bool path_currently_selected) {
++ return !pending;
++ }
+ };
+
+ class Actions {
Index: head/deskutils/easystroke/files/patch-actions.cc
===================================================================
--- head/deskutils/easystroke/files/patch-actions.cc
+++ head/deskutils/easystroke/files/patch-actions.cc
@@ -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::RefPtr<G
+ context->set_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 };
Index: head/deskutils/easystroke/files/patch-handler.cc
===================================================================
--- head/deskutils/easystroke/files/patch-handler.cc
+++ head/deskutils/easystroke/files/patch-handler.cc
@@ -1,6 +1,6 @@
--- 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(); }
};

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 3:51 AM (11 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15610904
Default Alt Text
D10815.diff (4 KB)

Event Timeline