Seems easier to make the C++11 fixes rather than patch the makefiles to
compile for C++03. There's a test failure, but I don't know if it's new.

- Matthew Martin


diff --git Makefile Makefile
index 78a8c328b25..2cc5016be00 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT =              software able to hide data in various kind of files
 
 DISTNAME =             steghide-0.5.1
-REVISION =             4
+REVISION =             5
 CATEGORIES =           security
 HOMEPAGE =             http://steghide.sf.net/
 
diff --git patches/patch-src_Arguments_h patches/patch-src_Arguments_h
new file mode 100644
index 00000000000..189f313f3c0
--- /dev/null
+++ patches/patch-src_Arguments_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Arguments.h
+--- src/Arguments.h.orig
++++ src/Arguments.h
+@@ -100,7 +100,7 @@ class Arguments {
+       static const VERBOSITY  Default_Verbosity = NORMAL ;
+       static const unsigned long      Default_Radius = 0 ; // there is no 
default radius for all file formats
+       static const unsigned int       Max_Algorithm = 3 ;
+-      static const float              Default_Goal = 100.0 ;
++      static constexpr float          Default_Goal = 100.0 ;
+       static const DEBUGCOMMAND       Default_DebugCommand = NONE ;
+       static const bool               Default_Check = false ;
+       static const unsigned int       Default_DebugLevel = 0 ;
diff --git patches/patch-src_ProgressOutput_h patches/patch-src_ProgressOutput_h
new file mode 100644
index 00000000000..133e2b781ca
--- /dev/null
+++ patches/patch-src_ProgressOutput_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/ProgressOutput.h
+--- src/ProgressOutput.h.orig
++++ src/ProgressOutput.h
+@@ -64,7 +64,7 @@ class ProgressOutput {
+        **/
+       void done (float rate, float avgweight = NoAvgWeight) const ;
+ 
+-      static const float NoAvgWeight = -1.0 ;
++      static constexpr float NoAvgWeight = -1.0 ;
+ 
+       protected:
+       std::string vcompose (const char *msgfmt, va_list ap) const ;

Reply via email to