From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- www-misc/wsmake/files/wsmake-0.6.4-bv.diff | 4 +-- .../files/wsmake-0.6.4-fix-const-va_list.patch | 29 ++++++++++++++++++++++ www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch | 12 ++++----- 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch (limited to 'www-misc/wsmake/files') diff --git a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff index d10aa5769c2d..15cdf05f5d25 100644 --- a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff +++ b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff @@ -1,5 +1,5 @@ ---- libwsmake/wsUtil.cpp.orig Sat Sep 1 22:09:13 2001 -+++ libwsmake/wsUtil.cpp Tue Sep 3 20:19:04 2002 +--- a/libwsmake/wsUtil.cpp ++++ b/libwsmake/wsUtil.cpp @@ -714,7 +714,8 @@ if(__wsmake_quiet) return; diff --git a/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch new file mode 100644 index 000000000000..420bbb61b030 --- /dev/null +++ b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch @@ -0,0 +1,29 @@ +--- a/libwsmake/wsUtil.cpp ++++ b/libwsmake/wsUtil.cpp +@@ -710,13 +710,13 @@ + } + } + +-void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap) ++void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap) + { + if(__wsmake_quiet) return; + + vfprintf(out,output,*ap); + //BV: this does not compile: va_end((void*&)*ap); +- va_end((char*&)*ap); ++ va_end(*ap); + } + + #ifdef DEBUG +--- a/libwsmake/wsUtil.h ++++ b/libwsmake/wsUtil.h +@@ -77,7 +77,7 @@ + void __wsmake_print_error(const char *, ...); + void __wsmake_print(const char *, ...); + void __wsmake_print(int, const char *, ...); +- void __wsmake_print_it(FILE *, const char *, const va_list *); ++ void __wsmake_print_it(FILE *, const char *, va_list *); + } + + #endif /* __WSUTIL_H__ */ diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch index 0ecfe62003f5..9028c0695546 100644 --- a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch +++ b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch @@ -1,8 +1,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=251745 https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&atid=105982 ---- libwsmake/wsSubTag.cpp -+++ libwsmake/wsSubTag.cpp.new +--- a/libwsmake/wsSubTag.cpp ++++ b/libwsmake/wsSubTag.cpp @@ -22,6 +22,7 @@ ***********************************************************************/ #include @@ -11,8 +11,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982& #include #ifdef HAVE_SYS_WAIT_H ---- libwsmake/wsWebPage.cpp -+++ libwsmake/wsWebPage.cpp.new +--- a/libwsmake/wsWebPage.cpp ++++ b/libwsmake/wsWebPage.cpp @@ -23,6 +23,7 @@ #include #include @@ -21,8 +21,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982& #include "wsmake.h" ---- libwsmake/wsUtil.cpp -+++ libwsmake/wsUtil.cpp.new +--- a/libwsmake/wsUtil.cpp ++++ b/libwsmake/wsUtil.cpp @@ -28,6 +28,7 @@ #include #include -- cgit v1.2.3