Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

steghide: revbump to rebuild #21230

Merged
merged 2 commits into from
Aug 24, 2024
Merged

steghide: revbump to rebuild #21230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86a9b7c
libmhash: make boolean usage libc++ portable
licy183 Aug 23, 2024
f3d7c34
steghide: revbump to rebuild
licy183 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/libmhash/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A thread-safe hash library which provides a uniform inte
TERMUX_PKG_LICENSE="LGPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.9.9.9
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/sourceforge/mhash/mhash-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0
TERMUX_PKG_BREAKS="libmhash-dev"
Expand Down
23 changes: 23 additions & 0 deletions packages/libmhash/libcxx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
https://github.com/void-linux/void-packages/pull/46005

--- a/include/mutils/mutils.h
+++ b/include/mutils/mutils.h
@@ -21,6 +21,9 @@
#if !defined(__MUTILS_H)
#define __MUTILS_H

+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
#include <mutils/mincludes.h>

#if defined(const)
@@ -97,7 +100,7 @@ typedef unsigned char mutils_word8;
*/

#if defined(HAVE__BOOL)
-#define mutils_boolean _Bool
+#define mutils_boolean bool
#else
typedef char mutils_boolean;
#endif
2 changes: 1 addition & 1 deletion packages/steghide/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Embeds a message in a file by replacing some of the leas
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.5.1
TERMUX_PKG_REVISION=6
TERMUX_PKG_REVISION=7
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/steghide/steghide-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b
TERMUX_PKG_AUTO_UPDATE=false
Expand Down
45 changes: 45 additions & 0 deletions packages/steghide/use-cxx11.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
error: no template named 'unary_function' in namespace 'std'

--- a/configure.in
+++ b/configure.in
@@ -22,14 +22,14 @@
then
AC_MSG_RESULT([yes])
AC_DEFINE(DEBUG,1,[enable code used only for debugging])
- CXXFLAGS="-O2 -Wall -g"
+ CXXFLAGS="-std=c++11 -O2 -Wall -g"
else
AC_MSG_RESULT([no])
- CXXFLAGS="-O2 -Wall"
+ CXXFLAGS="-std=c++11 -O2 -Wall"
fi
,
AC_MSG_RESULT([no])
- CXXFLAGS="-O2 -Wall"
+ CXXFLAGS="-std=c++11 -O2 -Wall"
)

dnl check if randomness should be disabled
--- a/configure
+++ b/configure
@@ -7560,17 +7560,17 @@
#define DEBUG 1
_ACEOF

- CXXFLAGS="-O2 -Wall -g"
+ CXXFLAGS="-std=c++11 -O2 -Wall -g"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
- CXXFLAGS="-O2 -Wall"
+ CXXFLAGS="-std=c++11 -O2 -Wall"
fi

else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
- CXXFLAGS="-O2 -Wall"
+ CXXFLAGS="-std=c++11 -O2 -Wall"

fi;