[smartcardpp] Fix build with GCC 4.6 (#507832)

Kalev Lember kalev at fedoraproject.org
Mon Jun 27 12:27:11 UTC 2011


commit f70222810e1731ff821ba1e8918169178d9ae80d
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Mon Jun 27 15:23:29 2011 +0300

    Fix build with GCC 4.6 (#507832)

 smartcardpp-0.2.0-gcc46.patch |   24 ++++++++++++++++++++++++
 smartcardpp.spec              |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/smartcardpp-0.2.0-gcc46.patch b/smartcardpp-0.2.0-gcc46.patch
new file mode 100644
index 0000000..69188ab
--- /dev/null
+++ b/smartcardpp-0.2.0-gcc46.patch
@@ -0,0 +1,24 @@
+From ba06998f3526eb5d9425df85d01865bb6260eed0 Mon Sep 17 00:00:00 2001
+From: kalevlember <kalevlember at 0d7e1ef0-d974-fc83-f0b3-ccc071561e0e>
+Date: Fri, 11 Mar 2011 10:58:44 +0000
+Subject: [PATCH] Fix the build with GCC 4.6
+
+Include <cstddef> for ptrdiff_t.
+
+git-svn-id: https://esteid.googlecode.com/svn/smartcardpp/trunk@3781 0d7e1ef0-d974-fc83-f0b3-ccc071561e0e
+---
+ locked_allocator.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/locked_allocator.h b/locked_allocator.h
+index 0a784dd..e8a52ab 100644
+--- a/locked_allocator.h
++++ b/locked_allocator.h
+@@ -1,3 +1,4 @@
++#include <cstddef>
+ #include <memory>
+ 
+ template <class T> class locked_allocator;
+-- 
+1.7.5.4
+
diff --git a/smartcardpp.spec b/smartcardpp.spec
index 36ae776..b1184a4 100644
--- a/smartcardpp.spec
+++ b/smartcardpp.spec
@@ -1,12 +1,13 @@
 Name:           smartcardpp
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for accessing smart cards
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.google.com/p/esteid/
 Source0:        http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
+Patch0:         smartcardpp-0.2.0-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -31,6 +32,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc46
 
 
 %build
@@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 27 2011 Kalev Lember <kalev at smartlink.ee> - 0.2.0-3
+- Fix build with GCC 4.6 (#507832)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list