[esteid-browser-plugin] Rebuild for boost 1.50, and backport a patch for Boost Filesystem v3

[Kalev Lember]

commit a13e96bb0db6fab41185f7176ccb77de089e49ca
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Mon Aug 6 11:40:41 2012 +0300

    Rebuild for boost 1.50, and backport a patch for Boost Filesystem v3

 ...id-browser-plugin-Use-boost-filesystem-v3.patch |   65 ++++++++++++++++++++
 esteid-browser-plugin.spec                         |   13 ++++-
 2 files changed, 77 insertions(+), 1 deletions(-)
---
diff --git a/0001-esteid-browser-plugin-Use-boost-filesystem-v3.patch b/0001-esteid-browser-plugin-Use-boost-filesystem-v3.patch
new file mode 100644
index 0000000..c4a020d
--- /dev/null
+++ b/0001-esteid-browser-plugin-Use-boost-filesystem-v3.patch
@@ -0,0 +1,65 @@
+From 773b43e0b2eab0754a40b81843eac22cd1b506b7 Mon Sep 17 00:00:00 2001
+From: kalevlember <kalevlember at 0d7e1ef0-d974-fc83-f0b3-ccc071561e0e>
+Date: Wed, 18 Jul 2012 12:56:03 +0000
+Subject: [PATCH] esteid-browser-plugin: Use boost filesystem v3
+
+Starting with boost 1.46, version 3 is the default and version 2 has
+been removed in boost 1.50.
+
+git-svn-id: https://esteid.googlecode.com/svn/esteid-browser-plugin/trunk@4006 0d7e1ef0-d974-fc83-f0b3-ccc071561e0e
+---
+ CMakeLists.txt     | 5 +----
+ PluginSettings.cpp | 8 ++++----
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4b88c4c..6a0f7d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,14 +45,11 @@ if (UNIX)
+ endif()
+ 
+ if (WITH_SYSTEM_BOOST)
+-    # FindBoost.cmake isn't up to date wrt new boost versions
+-    set(Boost_ADDITIONAL_VERSIONS "1.44" "1.44.0" "1.43" "1.43.0" "1.42" "1.42.0")
+-
+     if (WIN32)
+         # boost::signals is only needed for Windows UI code
+         set(EXTRA_BOOST_COMPONENTS "signals")
+     endif()
+-    find_package(Boost 1.41.0 COMPONENTS filesystem system thread ${EXTRA_BOOST_COMPONENTS} REQUIRED)
++    find_package(Boost 1.44 COMPONENTS filesystem system thread ${EXTRA_BOOST_COMPONENTS} REQUIRED)
+ else()
+     message(STATUS "Using bundled boost")
+     if (WIN32)
+diff --git a/PluginSettings.cpp b/PluginSettings.cpp
+index 1b23afb..cc47ea3 100644
+--- a/PluginSettings.cpp
++++ b/PluginSettings.cpp
+@@ -23,9 +23,9 @@
+ #include <stdlib.h>
+ #endif
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
++#define BOOST_FILESYSTEM_VERSION 3
+ #include <fstream>
+-#include <boost/filesystem/path.hpp>
++#include <boost/filesystem.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/foreach.hpp>
+ #include <boost/property_tree/ptree.hpp>
+@@ -60,9 +60,9 @@ path PluginSettings::globalSettingsDir()
+ path PluginSettings::userSettingsDir()
+ {
+ #ifdef _WIN32
+-    return path(getenv("APPDATA"), native);
++    return path(getenv("APPDATA"));
+ #else // UNIX
+-    path home(getenv("HOME"), native);
++    path home(getenv("HOME"));
+ # ifdef __APPLE__
+     return home / "Library/Application Support";
+ # else
+-- 
+1.7.11.2
+
diff --git a/esteid-browser-plugin.spec b/esteid-browser-plugin.spec
index 0c6af75..38a942a 100644
--- a/esteid-browser-plugin.spec
+++ b/esteid-browser-plugin.spec
@@ -8,7 +8,7 @@
 
 Name:           esteid-browser-plugin
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Estonian ID card digital signing browser plugin
 
 # The source files from esteid-browser-plugin and Firebreath are compiled
@@ -29,6 +29,9 @@ Source0:        http://firebreath.googlecode.com/files/firebreath-%{firebreath_v
 # ... and the source code for esteid-browser-plugin itself:
 Source1:        http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
 
+# Fix the build with boost 1.50, backported from upstream SVN
+Patch0:         0001-esteid-browser-plugin-Use-boost-filesystem-v3.patch
+
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -77,6 +80,11 @@ popd
 rm -rf src/3rdParty/boost
 rm -rf src/libs
 
+# Patch to fix the build with boost 1.50
+pushd projects/esteid-browser-plugin-%{version}
+%patch0 -p1 -b .boost_filesystem
+popd
+
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -122,6 +130,9 @@ done
 
 
 %changelog
+* Mon Aug 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.3.3-3
+- Rebuild for boost 1.50, and backport a patch for Boost Filesystem v3
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild