[arch-commits] Commit in steghide/trunk (PKGBUILD steghide-gcc6.patch)

[Antonio Rojas]

    Date: Saturday, June 9, 2018 @ 11:05:52
  Author: arojas
Revision: 342165

BUILDINFO rebuild

Added:
  steghide/trunk/steghide-gcc6.patch
Modified:
  steghide/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 steghide-gcc6.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 10:55:57 UTC (rev 342164)
+++ PKGBUILD	2018-06-09 11:05:52 UTC (rev 342165)
@@ -6,7 +6,7 @@
 
 pkgname=steghide
 pkgver=0.5.1
-pkgrel=8
+pkgrel=9
 pkgdesc='Embeds a message in a file by replacing some of the least significant bits'
 arch=('x86_64')
 url='http://steghide.sourceforge.net'
@@ -15,11 +15,13 @@
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'buildsystem.patch'
         'gcc-4.2.patch'
-         "${pkgname}-climits.patch")
+         "${pkgname}-climits.patch"
+         steghide-gcc6.patch)
 md5sums=('5be490e24807d921045780fd8cc446b3'
          '14f5e054d71c91262bb1140288043df8'
          'fd861dc5a0a392c6c94a61e85ad74f29'
-         '897ce18edd008293a3328bc3f88775b3')
+         '897ce18edd008293a3328bc3f88775b3'
+         '6dd60a84fccca270fa7315f1102454ff')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,6 +32,8 @@
   patch -Np1 -i ../gcc-4.2.patch
   patch -Np1 -i ../steghide-climits.patch
 
+  patch -p1 -i ../steghide-gcc6.patch # Fix build with GCC 6
+
   # touch files needed by GNU Autotools
   touch NEWS AUTHORS ChangeLog
 

Added: steghide-gcc6.patch
===================================================================
--- steghide-gcc6.patch	                        (rev 0)
+++ steghide-gcc6.patch	2018-06-09 11:05:52 UTC (rev 342165)
@@ -0,0 +1,22 @@
+--- steghide-0.5.1/src/Arguments.h.orig	2018-06-09 11:04:48.795952519 +0000
++++ steghide-0.5.1/src/Arguments.h	2018-06-09 11:00:57.239290249 +0000
+@@ -100,7 +100,7 @@
+ 	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 ;
+--- steghide-0.5.1/src/ProgressOutput.h.orig	2018-06-09 11:01:44.662622682 +0000
++++ steghide-0.5.1/src/ProgressOutput.h	2018-06-09 11:01:57.755955767 +0000
+@@ -64,7 +64,7 @@
+ 	 **/
+ 	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 ;