commit ae7b76e163a1151364565c262fb480523ce077c4
Author: Jan Rękorajski <[email protected]>
Date: Sat May 14 09:22:36 2016 +0200
- fixed building with modern compiler
MyPasswordSafe.spec | 2 ++
build.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+)
---
diff --git a/MyPasswordSafe.spec b/MyPasswordSafe.spec
index 9a21757..b19b6ad 100644
--- a/MyPasswordSafe.spec
+++ b/MyPasswordSafe.spec
@@ -8,6 +8,7 @@ Group: Applications/Databases
Source0:
http://www.semanticgap.com/myps/release/%{name}-%{version}.src.tgz
# Source0-md5: 0fef98e77c8e593382fb201bd278cacf
Source1: %{name}.desktop
+Patch0: build.patch
URL: http://www.semanticgap.com/myps/
BuildRequires: kde4-kde3support-devel
BuildRequires: qmake
@@ -48,6 +49,7 @@ możliwości:
%prep
%setup -q
+%patch0 -p1
%build
%{__make} \
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..0b3abdc
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,66 @@
+diff -ur MyPasswordSafe-20061216/src/crypto/bfproxy.cpp
MyPasswordSafe-20061216-cxx/src/crypto/bfproxy.cpp
+--- MyPasswordSafe-20061216/src/crypto/bfproxy.cpp 2004-12-06
14:07:03.000000000 +0100
++++ MyPasswordSafe-20061216-cxx/src/crypto/bfproxy.cpp 2016-05-14
09:19:34.294304951 +0200
+@@ -16,6 +16,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++#include <cstring>
+ #include "bfproxy.hpp"
+
+ BFProxy::BFProxy(const unsigned char *key, int len)
+diff -ur MyPasswordSafe-20061216/src/pwsafe/Util.cpp
MyPasswordSafe-20061216-cxx/src/pwsafe/Util.cpp
+--- MyPasswordSafe-20061216/src/pwsafe/Util.cpp 2004-12-06
13:32:09.000000000 +0100
++++ MyPasswordSafe-20061216-cxx/src/pwsafe/Util.cpp 2016-05-14
09:19:04.093954707 +0200
+@@ -5,6 +5,7 @@
+ #include "PW_BlowFish.h"
+ //#include "PwsPlatform.h"
+
++#include <limits.h>
+ #include <stdio.h>
+ #include <iostream>
+ using std::cout;
+diff -ur MyPasswordSafe-20061216/src/pwsafe/Util.h
MyPasswordSafe-20061216-cxx/src/pwsafe/Util.h
+--- MyPasswordSafe-20061216/src/pwsafe/Util.h 2004-11-01 22:54:35.000000000
+0100
++++ MyPasswordSafe-20061216-cxx/src/pwsafe/Util.h 2016-05-14
09:16:54.929114068 +0200
+@@ -10,6 +10,8 @@
+ #include <assert.h>
+
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ using std::string;
+ #include "PW_sha1.h"
+ #include "PwsPlatform.h"
+@@ -171,7 +173,7 @@
+ }
+ #endif
+
+-inline char * strFind( const char *str, const char *fstr )
++inline char * strFind( char *str, const char *fstr )
+ {
+ return strstr( str, fstr );
+ }
+diff -ur MyPasswordSafe-20061216/src/safe.hpp
MyPasswordSafe-20061216-cxx/src/safe.hpp
+--- MyPasswordSafe-20061216/src/safe.hpp 2005-11-23 14:21:29.000000000
+0100
++++ MyPasswordSafe-20061216-cxx/src/safe.hpp 2016-05-13 07:43:12.482802320
+0200
+@@ -129,7 +129,7 @@
+ SafeEntry(SafeGroup *parent);
+ SafeEntry(SafeGroup *parent,
+ const QString &n, const QString &u,
+- const EncryptedString &p, const QString &n);
++ const EncryptedString &p, const QString ¬e);
+ SafeEntry(const SafeEntry &item);
+ ~SafeEntry();
+
+diff -ur MyPasswordSafe-20061216/src/safeserializer.cpp
MyPasswordSafe-20061216-cxx/src/safeserializer.cpp
+--- MyPasswordSafe-20061216/src/safeserializer.cpp 2004-12-06
13:34:28.000000000 +0100
++++ MyPasswordSafe-20061216-cxx/src/safeserializer.cpp 2016-05-13
08:10:44.589090628 +0200
+@@ -16,6 +16,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++#include <algorithm>
+ #include <qstring.h>
+ #include "safe.hpp"
+ #include "safeserializer.hpp"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/MyPasswordSafe.git/commitdiff/ae7b76e163a1151364565c262fb480523ce077c4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
