From c496aadf531c13098dc78f1e3b598369b4f3659c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 24 Mar 2023 13:56:46 +0100
Subject: [PATCH] steghide: patch only for gcc11

---
 .../steghide/patches/steghide-0.5.1.patchset  | 36 -------------------
 .../patches/steghide-gcc11-0.5.1.patchset     | 36 +++++++++++++++++++
 app-crypt/steghide/steghide-0.5.1.recipe      |  5 ++-
 3 files changed, 40 insertions(+), 37 deletions(-)
 create mode 100644 app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset

diff --git a/app-crypt/steghide/patches/steghide-0.5.1.patchset b/app-crypt/steghide/patches/steghide-0.5.1.patchset
index a59d965d0..413de95f4 100644
--- a/app-crypt/steghide/patches/steghide-0.5.1.patchset
+++ b/app-crypt/steghide/patches/steghide-0.5.1.patchset
@@ -95,39 +95,3 @@ index 27b3d73..1c4023b
 2.37.3
 
 
-From bc7fef66be7fdc063cb62925609912e994780e0d Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Fri, 24 Mar 2023 13:43:26 +0100
-Subject: gcc11 fix
-
-
-diff --git a/src/Arguments.h b/src/Arguments.h
-index 018326c..1f907a7 100644
---- a/src/Arguments.h
-+++ b/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 a/src/ProgressOutput.h b/src/ProgressOutput.h
-index 3a235a3..394939f 100644
---- a/src/ProgressOutput.h
-+++ b/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 ;
--- 
-2.37.3
-
-
diff --git a/app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset b/app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset
new file mode 100644
index 000000000..8755b5082
--- /dev/null
+++ b/app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset
@@ -0,0 +1,36 @@
+From bc7fef66be7fdc063cb62925609912e994780e0d Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 24 Mar 2023 13:43:26 +0100
+Subject: gcc11 fix
+
+
+diff --git a/src/Arguments.h b/src/Arguments.h
+index 018326c..1f907a7 100644
+--- a/src/Arguments.h
++++ b/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 a/src/ProgressOutput.h b/src/ProgressOutput.h
+index 3a235a3..394939f 100644
+--- a/src/ProgressOutput.h
++++ b/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 ;
+-- 
+2.37.3
+
+
diff --git a/app-crypt/steghide/steghide-0.5.1.recipe b/app-crypt/steghide/steghide-0.5.1.recipe
index c9319babf..dff9d63ea 100644
--- a/app-crypt/steghide/steghide-0.5.1.recipe
+++ b/app-crypt/steghide/steghide-0.5.1.recipe
@@ -6,10 +6,13 @@ first-order statistical tests."
 HOMEPAGE="http://steghide.sourceforge.net/"
 COPYRIGHT="2001-2003 Stefan Hetzl"
 LICENSE="GNU GPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://downloads.sourceforge.net/steghide/steghide-$portVersion.tar.bz2"
 CHECKSUM_SHA256="a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1"
 PATCHES="steghide-$portVersion.patchset"
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	PATCHES+="steghide-gcc11-$portVersion.patchset"
+fi
 
 ARCHITECTURES="all"