commit abiword for openSUSE:Factory
Hello community, here is the log from the commit of package abiword for openSUSE:Factory checked in at 2017-02-02 15:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abiword (Old) and /work/SRC/openSUSE:Factory/.abiword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abiword" Changes: -------- --- /work/SRC/openSUSE:Factory/abiword/abiword.changes 2017-01-11 12:03:39.714368147 +0100 +++ /work/SRC/openSUSE:Factory/.abiword.new/abiword.changes 2017-02-03 17:31:07.648525961 +0100 @@ -1,0 +2,8 @@ +Tue Jan 17 16:03:35 UTC 2017 - adam.majer@suse.de + +- Add boost_asio.patch: Add support for boost::asio. +- Drop asio-devel BuildRequires, merged into boost 1.62. +- Replace boost-devel with libboost_headers-devel BuildRequires. +- Drop obsolete conditional for post(un) handling. + +------------------------------------------------------------------- New: ---- boost_asio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.xdl3vU/_old 2017-02-03 17:31:08.440413881 +0100 +++ /var/tmp/diff_new_pack.xdl3vU/_new 2017-02-03 17:31:08.444413315 +0100 @@ -31,13 +31,14 @@ Patch5: abiword-librevenge.patch # PATCH-FIX-UPSTREAM abiword-libwps-0.4.patch dimstar@opensuse.org -- Port to libwps-0.4; patch taken from Fedora. Patch6: abiword-libwps-0.4.patch -BuildRequires: asio-devel +# PATCH-FIX-UPSTREAM boost_asio.patch adam.majer@suse.de -- Aadd support for boost::asio +Patch7: boost_asio.patch BuildRequires: bison -BuildRequires: boost-devel BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: libboost_headers-devel BuildRequires: libgcrypt-devel BuildRequires: librsvg-devel BuildRequires: libsoup-devel @@ -106,6 +107,7 @@ %setup -q %patch5 %patch6 +%patch7 %build # We modified plugin configuration and thus we need to regenerate the whole build system @@ -148,19 +150,14 @@ install -dm 0755 %{buildroot}%{_datadir}/appdata install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/abiword.appdata.xml %suse_update_desktop_file %{name} - %fdupes %{buildroot} -%if 0%{?suse_version} > 1130 - %post %desktop_database_post %postun %desktop_database_postun -%endif - %post -n libabiword-3_0 -p /sbin/ldconfig %postun -n libabiword-3_0 -p /sbin/ldconfig ++++++ boost_asio.patch ++++++ Author: Adam Majer <adam.majer@suse.de> Date: Wed Jan 18 13:26:11 CET 2017 Upstream: http://bugzilla.abisource.com/show_bug.cgi?id=13839 Summary: Allow compilation with Boost::Asio Index: plugins/collab/backends/service/xp/AsyncWorker.h =================================================================== --- plugins/collab/backends/service/xp/AsyncWorker.h.orig +++ plugins/collab/backends/service/xp/AsyncWorker.h @@ -19,7 +19,12 @@ #ifndef __ASYNC_WORKER__ #define __ASYNC_WORKER__ -#include <asio.hpp> +#if defined(HAVE_BOOST_ASIO_HPP) +# include <boost/asio.hpp> +#else +# include <asio.hpp> +#endif + #include <boost/bind.hpp> #include <boost/function.hpp> #include <boost/noncopyable.hpp> Index: plugins/collab/backends/service/xp/RealmConnection.h =================================================================== --- plugins/collab/backends/service/xp/RealmConnection.h.orig +++ plugins/collab/backends/service/xp/RealmConnection.h @@ -21,7 +21,11 @@ #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> -#include <asio.hpp> +#if defined(HAVE_BOOST_ASIO_HPP) +# include <boost/asio.hpp> +#else +# include <asio.hpp> +#endif #include <vector> #include <string> #include "ut_types.h" Index: plugins/collab/backends/service/xp/RealmProtocol.h =================================================================== --- plugins/collab/backends/service/xp/RealmProtocol.h.orig +++ plugins/collab/backends/service/xp/RealmProtocol.h @@ -9,7 +9,11 @@ #include <stdint.h> #endif #include <boost/shared_ptr.hpp> -#include <asio.hpp> +#if defined(HAVE_BOOST_ASIO_HPP) +# include <boost/asio.hpp> +#else +# include <asio.hpp> +#endif namespace realm { Index: plugins/collab/backends/service/xp/tls_tunnel.h =================================================================== --- plugins/collab/backends/service/xp/tls_tunnel.h.orig +++ plugins/collab/backends/service/xp/tls_tunnel.h @@ -33,7 +33,11 @@ #include <boost/function.hpp> #include <boost/lexical_cast.hpp> #include <boost/enable_shared_from_this.hpp> -#include <asio.hpp> +#if defined(HAVE_BOOST_ASIO_HPP) +# include <boost/asio.hpp> +#else +# include <asio.hpp> +#endif #include <string> #include <vector> #ifdef _MSC_VER Index: plugins/collab/backends/tcp/xp/IOServerHandler.h =================================================================== --- plugins/collab/backends/tcp/xp/IOServerHandler.h.orig +++ plugins/collab/backends/tcp/xp/IOServerHandler.h @@ -23,7 +23,11 @@ #include <boost/bind.hpp> #include <boost/function.hpp> -#include <asio.hpp> +#if defined(HAVE_BOOST_ASIO_HPP) +# include <boost/asio.hpp> +#else +# include <asio.hpp> +#endif #include <sync/xp/Synchronizer.h> #include "Session.h" Index: plugins/collab/plugin.m4 =================================================================== --- plugins/collab/plugin.m4.orig +++ plugins/collab/plugin.m4 @@ -59,18 +59,20 @@ AC_ARG_ENABLE([collab-backend-tcp], enable_collab_backend_tcp=$enableval if test "$enable_collab_backend_tcp" != "no"; then AC_LANG_PUSH(C++) - AC_CHECK_HEADERS([asio.hpp], [], + AC_CHECK_HEADERS([asio.hpp], [], + [AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])], [ AC_MSG_ERROR([collab plugin: asio is required for the collab plugin TCP backend, see http://think-async.com/]) - ]) + ])]) AC_LANG_POP fi ], [ AC_LANG_PUSH(C++) AC_CHECK_HEADERS([asio.hpp], + [AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])], [ enable_collab_backend_tcp="yes" - ]) + ])]) AC_LANG_POP ]) AC_MSG_CHECKING([for collab tcp backend]) @@ -99,17 +101,19 @@ AC_ARG_ENABLE([collab-backend-service], if test "$enable_collab_backend_service" != "no"; then AC_LANG_PUSH(C++) AC_CHECK_HEADERS([asio.hpp], [], + [AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])], [ AC_MSG_ERROR([collab plugin: asio is required for the the abicollab.net backend, see http://think-async.com/]) - ]) + ])]) AC_LANG_POP fi ], [ AC_LANG_PUSH(C++) AC_CHECK_HEADERS([asio.hpp], + [AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])], [ enable_collab_backend_service="yes" - ]) + ])]) AC_LANG_POP ]) test "$enable_collab_backend_service" = "yes" && collab_pkgs="$collab_pkgs $collab_service_req"
participants (1)
-
root＠hilbertn.suse.de