diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2017-05-30 21:13:56 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-18 00:10:33 -0500 |
| commit | 334ebaa824142c354cf67f3c245dd31cf3902c53 (patch) | |
| tree | 43ffaf41f902e402dce6feabc0726654b568ef53 | |
| parent | 73a9ee3c5171ec1e01c4abe5571a260194da6991 (diff) | |
system/xnp2: Patched for gcc >= 6.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | system/xnp2/gcc6.patch | 17 | ||||
| -rw-r--r-- | system/xnp2/xnp2.SlackBuild | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/system/xnp2/gcc6.patch b/system/xnp2/gcc6.patch new file mode 100644 index 000000000000..62659596664f --- /dev/null +++ b/system/xnp2/gcc6.patch @@ -0,0 +1,17 @@ +--- xnp2-0.86/x11/compiler.h.old 2016-03-08 18:25:50.000000000 +0100 ++++ xnp2-0.86/x11/compiler.h 2016-07-05 23:48:04.507937827 +0200 +@@ -117,12 +117,14 @@ + #define MAX_PATH MAXPATHLEN + #endif + ++#ifndef __cplusplus + #ifndef max + #define max(a,b) (((a) > (b)) ? (a) : (b)) + #endif + #ifndef min + #define min(a,b) (((a) < (b)) ? (a) : (b)) + #endif ++#endif /* __cplusplus */ + + #ifndef ZeroMemory + #define ZeroMemory(d,n) memset((d), 0, (n)) diff --git a/system/xnp2/xnp2.SlackBuild b/system/xnp2/xnp2.SlackBuild index bbd8e9d8268d..b8a467720cee 100644 --- a/system/xnp2/xnp2.SlackBuild +++ b/system/xnp2/xnp2.SlackBuild @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to the archlinux folks! +patch -p2 < $CWD/gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |