[packages/grive] - make c++ happy on 32-bit archs

baggins baggins at pld-linux.org
Wed Dec 4 11:42:52 CET 2013


commit 057d54440e538585ebdc8f4a3ecca8292a759ffd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Dec 4 11:42:36 2013 +0100

    - make c++ happy on 32-bit archs

 build.patch | 18 ++++++++++++++++++
 grive.spec  |  2 ++
 2 files changed, 20 insertions(+)
---
diff --git a/grive.spec b/grive.spec
index 5c3e9ed..a57c01f 100644
--- a/grive.spec
+++ b/grive.spec
@@ -13,6 +13,7 @@ Source0:	https://github.com/Grive/grive/archive/%{commit}/%{name}-%{version}-%{s
 # https://github.com/Grive/grive/issues/187
 Patch0:		json-c.patch
 Patch1:		%{name}-bgrive_cmake_fix.patch
+Patch2:		build.patch
 URL:		http://www.lbreda.com/grive/
 BuildRequires:	QtCore-devel
 BuildRequires:	binutils-devel
@@ -44,6 +45,7 @@ GUI frontend for %{name}
 %setup -q -n %{name}-%{commit}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..c33d49b
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,18 @@
+--- grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/drive/State.cc~	2013-05-02 18:40:04.000000000 +0200
++++ grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/drive/State.cc	2013-12-04 11:38:00.382356428 +0100
+@@ -248,12 +248,12 @@
+ void State::Write( const fs::path& filename ) const
+ {
+ 	Json last_sync ;
+-	last_sync.Add( "sec",	Json(m_last_sync.Sec() ) );
+-	last_sync.Add( "nsec",	Json(m_last_sync.NanoSec() ) );
++	last_sync.Add( "sec",	Json((std::size_t)m_last_sync.Sec() ) );
++	last_sync.Add( "nsec",	Json((std::size_t)m_last_sync.NanoSec() ) );
+ 	
+ 	Json result ;
+ 	result.Add( "last_sync", last_sync ) ;
+-	result.Add( "change_stamp", Json(m_cstamp) ) ;
++	result.Add( "change_stamp", Json((std::size_t)m_cstamp) ) ;
+ 	
+ 	std::ofstream fs( filename.string().c_str() ) ;
+ 	fs << result ;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grive.git/commitdiff/057d54440e538585ebdc8f4a3ecca8292a759ffd



More information about the pld-cvs-commit mailing list