package / abiword

Clone
Source Code
GIT

Blame boost_asio.patch

master
  1.   d2808082cb12c10c5392e620c521ca62970de14c
  2.   boost_asio.patch
Blob History Raw
Bernhard M. Wiedemann 2d3900 
Author: Adam Majer <adam.majer@suse.de>
Bernhard M. Wiedemann 2d3900 
Date: Wed Jan 18 13:26:11 CET 2017
Bernhard M. Wiedemann 2d3900 
Upstream: http://bugzilla.abisource.com/show_bug.cgi?id=13839
Bernhard M. Wiedemann 2d3900 
Summary: Allow compilation with Boost::Asio
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
Index: plugins/collab/backends/service/xp/AsyncWorker.h
Bernhard M. Wiedemann 2d3900 
===================================================================
Bernhard M. Wiedemann 2d3900 
--- plugins/collab/backends/service/xp/AsyncWorker.h.orig
Bernhard M. Wiedemann 2d3900 
+++ plugins/collab/backends/service/xp/AsyncWorker.h
Bernhard M. Wiedemann 2d3900 
@@ -19,7 +19,12 @@
Bernhard M. Wiedemann 2d3900 
 #ifndef __ASYNC_WORKER__
Bernhard M. Wiedemann 2d3900 
 #define __ASYNC_WORKER__
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
-#include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#if defined(HAVE_BOOST_ASIO_HPP)
Bernhard M. Wiedemann 2d3900 
+# include <boost/asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#else
Bernhard M. Wiedemann 2d3900 
+# include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#endif
Bernhard M. Wiedemann 2d3900 
+
Bernhard M. Wiedemann 2d3900 
 #include <boost/bind.hpp>
Bernhard M. Wiedemann 2d3900 
 #include <boost/function.hpp>
Bernhard M. Wiedemann 2d3900 
 #include <boost/noncopyable.hpp>
Bernhard M. Wiedemann 2d3900 
Index: plugins/collab/backends/service/xp/RealmConnection.h
Bernhard M. Wiedemann 2d3900 
===================================================================
Bernhard M. Wiedemann 2d3900 
--- plugins/collab/backends/service/xp/RealmConnection.h.orig
Bernhard M. Wiedemann 2d3900 
+++ plugins/collab/backends/service/xp/RealmConnection.h
Bernhard M. Wiedemann 2d3900 
@@ -21,7 +21,11 @@
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
 #include <boost/shared_ptr.hpp>
Bernhard M. Wiedemann 2d3900 
 #include <boost/enable_shared_from_this.hpp>
Bernhard M. Wiedemann 2d3900 
-#include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#if defined(HAVE_BOOST_ASIO_HPP)
Bernhard M. Wiedemann 2d3900 
+# include <boost/asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#else
Bernhard M. Wiedemann 2d3900 
+# include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#endif
Bernhard M. Wiedemann 2d3900 
 #include <vector>
Bernhard M. Wiedemann 2d3900 
 #include <string>
Bernhard M. Wiedemann 2d3900 
 #include "ut_types.h"
Bernhard M. Wiedemann 2d3900 
Index: plugins/collab/backends/service/xp/RealmProtocol.h
Bernhard M. Wiedemann 2d3900 
===================================================================
Bernhard M. Wiedemann 2d3900 
--- plugins/collab/backends/service/xp/RealmProtocol.h.orig
Bernhard M. Wiedemann 2d3900 
+++ plugins/collab/backends/service/xp/RealmProtocol.h
Bernhard M. Wiedemann 2d3900 
@@ -9,7 +9,11 @@
Bernhard M. Wiedemann 2d3900 
 #include <stdint.h>
Bernhard M. Wiedemann 2d3900 
 #endif
Bernhard M. Wiedemann 2d3900 
 #include <boost/shared_ptr.hpp>
Bernhard M. Wiedemann 2d3900 
-#include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#if defined(HAVE_BOOST_ASIO_HPP)
Bernhard M. Wiedemann 2d3900 
+# include <boost/asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#else
Bernhard M. Wiedemann 2d3900 
+# include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#endif
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
 namespace realm {
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
Index: plugins/collab/backends/service/xp/tls_tunnel.h
Bernhard M. Wiedemann 2d3900 
===================================================================
Bernhard M. Wiedemann 2d3900 
--- plugins/collab/backends/service/xp/tls_tunnel.h.orig
Bernhard M. Wiedemann 2d3900 
+++ plugins/collab/backends/service/xp/tls_tunnel.h
Bernhard M. Wiedemann 2d3900 
@@ -33,7 +33,11 @@
Bernhard M. Wiedemann 2d3900 
 #include <boost/function.hpp>
Bernhard M. Wiedemann 2d3900 
 #include <boost/lexical_cast.hpp>
Bernhard M. Wiedemann 2d3900 
 #include <boost/enable_shared_from_this.hpp>
Bernhard M. Wiedemann 2d3900 
-#include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#if defined(HAVE_BOOST_ASIO_HPP)
Bernhard M. Wiedemann 2d3900 
+# include <boost/asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#else
Bernhard M. Wiedemann 2d3900 
+# include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#endif
Bernhard M. Wiedemann 2d3900 
 #include <string>
Bernhard M. Wiedemann 2d3900 
 #include <vector>
Bernhard M. Wiedemann 2d3900 
 #ifdef _MSC_VER
Bernhard M. Wiedemann 2d3900 
Index: plugins/collab/backends/tcp/xp/IOServerHandler.h
Bernhard M. Wiedemann 2d3900 
===================================================================
Bernhard M. Wiedemann 2d3900 
--- plugins/collab/backends/tcp/xp/IOServerHandler.h.orig
Bernhard M. Wiedemann 2d3900 
+++ plugins/collab/backends/tcp/xp/IOServerHandler.h
Bernhard M. Wiedemann 2d3900 
@@ -23,7 +23,11 @@
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
 #include <boost/bind.hpp>
Bernhard M. Wiedemann 2d3900 
 #include <boost/function.hpp>
Bernhard M. Wiedemann 2d3900 
-#include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#if defined(HAVE_BOOST_ASIO_HPP)
Bernhard M. Wiedemann 2d3900 
+# include <boost/asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#else
Bernhard M. Wiedemann 2d3900 
+# include <asio.hpp>
Bernhard M. Wiedemann 2d3900 
+#endif
Bernhard M. Wiedemann 2d3900
Bernhard M. Wiedemann 2d3900 
 #include <sync/xp/Synchronizer.h>
Bernhard M. Wiedemann 2d3900 
 #include "Session.h"
Bernhard M. Wiedemann 2d3900 
Index: plugins/collab/plugin.m4
Bernhard M. Wiedemann 2d3900 
===================================================================
Bernhard M. Wiedemann 2d3900 
--- plugins/collab/plugin.m4.orig
Bernhard M. Wiedemann 2d3900 
+++ plugins/collab/plugin.m4
Bernhard M. Wiedemann 2d3900 
@@ -59,18 +59,20 @@ AC_ARG_ENABLE([collab-backend-tcp],
Bernhard M. Wiedemann 2d3900 
 	enable_collab_backend_tcp=$enableval
Bernhard M. Wiedemann 2d3900 
 	if test "$enable_collab_backend_tcp" != "no"; then
Bernhard M. Wiedemann 2d3900 
 		AC_LANG_PUSH(C++)
Bernhard M. Wiedemann 2d3900 
-		AC_CHECK_HEADERS([asio.hpp], [],
Bernhard M. Wiedemann 2d3900 
+		AC_CHECK_HEADERS([asio.hpp], [],
Bernhard M. Wiedemann 2d3900 
+			[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
Bernhard M. Wiedemann 2d3900 
 		[
Bernhard M. Wiedemann 2d3900 
 			AC_MSG_ERROR([collab plugin: asio is required for the collab plugin TCP backend, see http://think-async.com/])
Bernhard M. Wiedemann 2d3900 
-		])
Bernhard M. Wiedemann 2d3900 
+		])])
Bernhard M. Wiedemann 2d3900 
 		AC_LANG_POP
Bernhard M. Wiedemann 2d3900 
 	fi
Bernhard M. Wiedemann 2d3900 
 ], [
Bernhard M. Wiedemann 2d3900 
 	AC_LANG_PUSH(C++)
Bernhard M. Wiedemann 2d3900 
 	AC_CHECK_HEADERS([asio.hpp],
Bernhard M. Wiedemann 2d3900 
+			[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
Bernhard M. Wiedemann 2d3900 
 	[
Bernhard M. Wiedemann 2d3900 
 		enable_collab_backend_tcp="yes"
Bernhard M. Wiedemann 2d3900 
-	])
Bernhard M. Wiedemann 2d3900 
+	])])
Bernhard M. Wiedemann 2d3900 
 	AC_LANG_POP
Bernhard M. Wiedemann 2d3900 
 ])
Bernhard M. Wiedemann 2d3900 
 AC_MSG_CHECKING([for collab tcp backend])
Bernhard M. Wiedemann 2d3900 
@@ -99,17 +101,19 @@ AC_ARG_ENABLE([collab-backend-service],
Bernhard M. Wiedemann 2d3900 
 	if test "$enable_collab_backend_service" != "no"; then
Bernhard M. Wiedemann 2d3900 
 		AC_LANG_PUSH(C++)
Bernhard M. Wiedemann 2d3900 
 		AC_CHECK_HEADERS([asio.hpp], [],
Bernhard M. Wiedemann 2d3900 
+			[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
Bernhard M. Wiedemann 2d3900 
 		[
Bernhard M. Wiedemann 2d3900 
 			AC_MSG_ERROR([collab plugin: asio is required for the the abicollab.net backend, see http://think-async.com/])
Bernhard M. Wiedemann 2d3900 
-		])
Bernhard M. Wiedemann 2d3900 
+		])])
Bernhard M. Wiedemann 2d3900 
 		AC_LANG_POP
Bernhard M. Wiedemann 2d3900 
 	fi
Bernhard M. Wiedemann 2d3900 
 ], [
Bernhard M. Wiedemann 2d3900 
 	AC_LANG_PUSH(C++)
Bernhard M. Wiedemann 2d3900 
 	AC_CHECK_HEADERS([asio.hpp],
Bernhard M. Wiedemann 2d3900 
+			[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
Bernhard M. Wiedemann 2d3900 
 	[
Bernhard M. Wiedemann 2d3900 
 		enable_collab_backend_service="yes"
Bernhard M. Wiedemann 2d3900 
-	])
Bernhard M. Wiedemann 2d3900 
+	])])
Bernhard M. Wiedemann 2d3900 
 	AC_LANG_POP
Bernhard M. Wiedemann 2d3900 
 ])
Bernhard M. Wiedemann 2d3900 
 test "$enable_collab_backend_service" = "yes" && collab_pkgs="$collab_pkgs $collab_service_req"
Powered by Pagure 5.13.3
Documentation • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.