From 7a1f7348685e96350efd6c2ad4a2f9b65e746be9826e6a39505f0e66a5433c16 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 12 Jan 2013 10:22:23 +0000 Subject: [PATCH] osc copypac from project:openSUSE:Factory package:boost revision:72 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=74 --- boost-asio-export-symbols.patch | 43 --------------------------------- boost.changes | 5 ---- boost.spec | 4 +-- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 boost-asio-export-symbols.patch diff --git a/boost-asio-export-symbols.patch b/boost-asio-export-symbols.patch deleted file mode 100644 index 4b4518e..0000000 --- a/boost-asio-export-symbols.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: boost/asio/detail/config.hpp -=================================================================== ---- boost/asio/detail/config.hpp.orig -+++ boost/asio/detail/config.hpp -@@ -28,18 +28,16 @@ - #if defined(BOOST_ASIO_HEADER_ONLY) - # define BOOST_ASIO_DECL inline - #else // defined(BOOST_ASIO_HEADER_ONLY) --# if defined(BOOST_HAS_DECLSPEC) - // We need to import/export our code only if the user has specifically asked - // for it by defining BOOST_ASIO_DYN_LINK. --# if defined(BOOST_ASIO_DYN_LINK) -+# if defined(BOOST_ASIO_DYN_LINK) - // Export if this is our own source, otherwise import. --# if defined(BOOST_ASIO_SOURCE) --# define BOOST_ASIO_DECL __declspec(dllexport) --# else // defined(BOOST_ASIO_SOURCE) --# define BOOST_ASIO_DECL __declspec(dllimport) --# endif // defined(BOOST_ASIO_SOURCE) --# endif // defined(BOOST_ASIO_DYN_LINK) --# endif // defined(BOOST_HAS_DECLSPEC) -+# if defined(BOOST_ASIO_SOURCE) -+# define BOOST_ASIO_DECL BOOST_SYMBOL_EXPORT -+# else // defined(BOOST_ASIO_SOURCE) -+# define BOOST_ASIO_DECL BOOST_SYMBOL_IMPORT -+# endif // defined(BOOST_ASIO_SOURCE) -+# endif // defined(BOOST_ASIO_DYN_LINK) - #endif // defined(BOOST_ASIO_HEADER_ONLY) - - // If BOOST_ASIO_DECL isn't defined yet define it now. -Index: boost/asio/io_service.hpp -=================================================================== ---- boost/asio/io_service.hpp.orig -+++ boost/asio/io_service.hpp -@@ -672,7 +672,7 @@ public: - }; - - /// Base class for all io_service services. --class io_service::service -+class BOOST_ASIO_DECL io_service::service - : private noncopyable - { - public: diff --git a/boost.changes b/boost.changes index d6585fb..788fad1 100644 --- a/boost.changes +++ b/boost.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Jan 2 19:00:38 UTC 2013 - fisiu@opensuse.org - -- Add boost-asio-export-symbols.patch: boost#6688 - ------------------------------------------------------------------- Thu Sep 6 13:12:38 UTC 2012 - cfarrell@suse.com diff --git a/boost.spec b/boost.spec index fd3e9e7..35e0fe1 100644 --- a/boost.spec +++ b/boost.spec @@ -1,7 +1,7 @@ # # spec file for package boost # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -103,7 +103,6 @@ Patch1: boost-thread.patch Patch2: boost-no_type_punning.patch Patch8: boost-no_segfault_in_Regex_filter.patch Patch20: boost-strict_aliasing.patch -Patch30: boost-asio-export-symbols.patch Patch50: boost-use_std_xml_catalog.patch Patch51: boost-fix_documentation.patch Patch52: boost-chrono_add_function_return.patch @@ -382,7 +381,6 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} #%%patch9 #%%patch19 %patch20 -%patch30 %patch50 %patch51 %patch52