From 431e7a0421cf4bff82e053771ec682b7520920f5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 24 Mar 2023 13:46:26 +0100 Subject: [PATCH] steghide: fix gcc11 build --- .../steghide/patches/steghide-0.5.1.patchset | 41 ++++++++++++++++++- app-crypt/steghide/steghide-0.5.1.recipe | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/app-crypt/steghide/patches/steghide-0.5.1.patchset b/app-crypt/steghide/patches/steghide-0.5.1.patchset index e5127d3f3..a59d965d0 100644 --- a/app-crypt/steghide/patches/steghide-0.5.1.patchset +++ b/app-crypt/steghide/patches/steghide-0.5.1.patchset @@ -1,4 +1,4 @@ -From 0cfb3d091cc4cd236042c5c4b784f2f240e6a3b1 Mon Sep 17 00:00:00 2001 +From 87cb97a99e1432c6e63f436a3c6eedbcff8ce2ba Mon Sep 17 00:00:00 2001 From: nys <33534144+nysnatuss@users.noreply.github.com> Date: Fri, 29 Dec 2017 21:48:53 +0000 Subject: fix steghide code @@ -92,5 +92,42 @@ index 27b3d73..1c4023b free (name) ; return retval ; -- -2.15.0 +2.37.3 + + +From bc7fef66be7fdc063cb62925609912e994780e0d Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 94ab67bd5..c9319babf 100644 --- a/app-crypt/steghide/steghide-0.5.1.recipe +++ b/app-crypt/steghide/steghide-0.5.1.recipe @@ -6,7 +6,7 @@ first-order statistical tests." HOMEPAGE="http://steghide.sourceforge.net/" COPYRIGHT="2001-2003 Stefan Hetzl" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="https://downloads.sourceforge.net/steghide/steghide-$portVersion.tar.bz2" CHECKSUM_SHA256="a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1" PATCHES="steghide-$portVersion.patchset"