aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2014-12-05 21:14:01 +0000
committerKoop Mast <kwm@FreeBSD.org>2014-12-05 21:14:01 +0000
commite676d157babd75144a9039600c2f5f0c45a78978 (patch)
tree4dd68bcce34ceca6c371a1649c9ce0509e60b3ba
parentbd0cd2813b5642e848337deccaa1524d747931ef (diff)
downloadports-e676d157babd75144a9039600c2f5f0c45a78978.tar.gz
ports-e676d157babd75144a9039600c2f5f0c45a78978.zip
Notes
-rw-r--r--editors/abiword/Makefile3
-rw-r--r--editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h11
-rw-r--r--editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h11
3 files changed, 24 insertions, 1 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index b0f8b8fa8682..c9657fbc32f2 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -4,7 +4,7 @@
PORTNAME= abiword
PORTVERSION= 2.8.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -37,6 +37,7 @@ CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \
--enable-collab-backend-sugar
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
+INSTALL_TARGET= install-strip
ABIVERSION= 2.8
PLIST_SUB+= ABIVERSION=${ABIVERSION}
diff --git a/editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h b/editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h
new file mode 100644
index 000000000000..f75772088bea
--- /dev/null
+++ b/editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h
@@ -0,0 +1,11 @@
+--- ./plugins/collab/backends/tcp/xp/Session.h.orig 2014-12-05 21:51:55.334456277 +0100
++++ ./plugins/collab/backends/tcp/xp/Session.h 2014-12-05 21:51:31.075459132 +0100
+@@ -31,7 +31,7 @@
+
+ class TCPAccountHandler;
+
+-class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this<Session>
++class Session : public Synchronizer, public asio::noncopyable, public boost::enable_shared_from_this<Session>
+ {
+ public:
+ Session(asio::io_service& io_service, boost::function<void (boost::shared_ptr<Session>)> ef)
diff --git a/editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h b/editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h
new file mode 100644
index 000000000000..cd481ded8ea4
--- /dev/null
+++ b/editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h
@@ -0,0 +1,11 @@
+--- ./plugins/collab/core/sync/xp/SynchronizedQueue.h.orig 2014-12-05 21:45:41.710482488 +0100
++++ ./plugins/collab/core/sync/xp/SynchronizedQueue.h 2014-12-05 21:46:02.610480585 +0100
+@@ -28,7 +28,7 @@
+ class EmptyQueueException {};
+
+ template <typename T>
+-class SynchronizedQueue : public Synchronizer, public boost::noncopyable
++class SynchronizedQueue : public Synchronizer, public asio::noncopyable
+ {
+ public:
+ SynchronizedQueue(boost::function<void (SynchronizedQueue&)> sig)