From dcde8a75575cb4c256ea982593c9710ac16b022c Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Thu, 21 Jun 2012 23:06:59 +0200
Subject: [PATCH] Build Boost.Locale backends - Resolves: #832265

Conflicts:

	boost.spec
---
 boost-1.48.0-locale.patch | 61 +++++++++++++++++++++++++++++++++++++++
 boost.spec                | 10 ++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 boost-1.48.0-locale.patch

diff --git a/boost-1.48.0-locale.patch b/boost-1.48.0-locale.patch
new file mode 100644
index 0000000..277fa56
--- /dev/null
+++ b/boost-1.48.0-locale.patch
@@ -0,0 +1,61 @@
+diff -up boost_1_48_0/libs/locale/src/CMakeLists.txt\~ boost_1_48_0/libs/locale/src/CMakeLists.txt
+--- boost_1_48_0/libs/locale/src/CMakeLists.txt~	2012-06-07 00:46:43.651884964 +0200
++++ boost_1_48_0/libs/locale/src/CMakeLists.txt	2012-06-21 19:01:16.321372875 +0200
+@@ -10,6 +10,10 @@ if (ICU_FOUND AND ICU_I18N_FOUND)
+   set (BOOST_LOCALE_ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+   colormsg (GREEN "+-- ICU (unicode) available for locale, enabling support.")
+-  set (NO_STATIC_IF_ICU_FOUND "NO_STATIC")
++  set (NO_STATIC_IF_ICU_FOUND NO_STATIC NO_SINGLE_THREADED)
++  set (ICU_SOURCES icu/boundary.cpp icu/codecvt.cpp icu/collator.cpp
++       icu/conversion.cpp icu/date_time.cpp icu/formatter.cpp
++       icu/icu_backend.cpp icu/numeric.cpp icu/time_zone.cpp )
++  set (ICU_DEPENDS boost_thread)
+ else (ICU_FOUND AND ICU_I18N_FOUND)
+   colormsg (CYAN "+-- ICU (unicode) not available for locale, disabling support.")
+ endif (ICU_FOUND AND ICU_I18N_FOUND)
+@@ -17,8 +17,9 @@ endif (ICU_FOUND AND ICU_I18N_FOUND)
+ if (WIN32)
+   add_definitions (-DBOOST_LOCALE_NO_POSIX_BACKEND=1)
+   set (WIN32_SOURCES win32/collate.cpp win32/converter.cpp win32/lcid.cpp
+-       win32/numeric.cpp win32/win_backend.cpp std/codecvt.cpp std/collate.cpp
+-       std/converter.cpp std/numeric.cpp std/std_backend.cpp util/gregorian.cpp)
++       win32/numeric.cpp win32/win_backend.cpp )
++else (WIN32)
++  add_definitions (-DBOOST_LOCALE_NO_WINAPI_BACKEND=1)
+ endif (WIN32)
+ 
+ add_definitions (-DBOOST_THREAD_NO_LIB=1)
+@@ -33,12 +34,29 @@ boost_add_library (
+   shared/localization_backend.cpp
+   shared/message.cpp
+   shared/mo_lambda.cpp
+-  ${WIN32_SOURCES}
++
+   util/codecvt_converter.cpp
+   util/default_locale.cpp
+   util/info.cpp
+-  util/locale_data.cpp  
++  util/locale_data.cpp
++  util/gregorian.cpp
++
++  std/codecvt.cpp
++  std/collate.cpp
++  std/converter.cpp
++  std/numeric.cpp
++  std/std_backend.cpp
++
++  posix/codecvt.cpp
++  posix/collate.cpp
++  posix/converter.cpp
++  posix/numeric.cpp
++  posix/posix_backend.cpp
++
++  ${WIN32_SOURCES}
++  ${ICU_SOURCES}
+ 
++  DEPENDS ${ICU_DEPENDS}
+   LINK_LIBS ${BOOST_LOCALE_ICU_LIBRARIES}
+   SHARED_COMPILE_FLAGS -DBOOST_LOCALE_DYN_LINK=1
+   ${NO_STATIC_IF_ICU_FOUND}
+
+Diff finished.  Thu Jun 21 19:05:54 2012
diff --git a/boost.spec b/boost.spec
index 9a0d5ca..8a033c4 100644
--- a/boost.spec
+++ b/boost.spec
@@ -26,7 +26,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.48.0
 %define version_enc 1_48_0
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: Boost and MIT and Python
 
 # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@ -152,6 +152,9 @@ Patch14: boost-1.48.0-xtime.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=828857
 Patch15: boost-1.48.0-pool.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=832265
+Patch16: boost-1.48.0-locale.patch
+
 %bcond_with tests
 %bcond_with docs_generated
 
@@ -541,6 +544,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
 %patch13 -p1
 %patch14 -p1
 %patch15 -p0
+%patch16 -p1
 
 %build
 # Support for building tests.
@@ -1079,6 +1083,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Thu Jun 21 2012 Petr Machata <pmachata@redhat.com> - 1.48.0-16
+- Build Boost.Locale backends
+- Resolves: #832265
+
 * Wed Jun  6 2012 Petr Machata <pmachata@redhat.com> - 1.48.0-15
 - In Boost.Pool, be careful not to overflow allocated chunk size.
 - Resolves: #828857