diff options
| author |   Matteo Bernardini | 2017-08-07 16:31:24 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2017-08-07 16:31:24 +0200 |
| commit | 16f7c508bb21dabaf5d8068454a31ca6f3d6c979 (patch) | |
| tree | e3aea401c8004362cc89daa2db7b308fcb12598f /libraries/wvstreams | |
| parent | 5e5132bde843b256dd4833682296e363a01f78c2 (diff) | |
| download | old.slackbuilds-830af7984ec508e7fc1739d7af30add2a3a15d7b.tar.gz | |
20170807.1 global branch merge.current-20170807.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/wvstreams')
| -rw-r--r-- | libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch | 50 | ||||
| -rw-r--r-- | libraries/wvstreams/wvstreams.SlackBuild | 4 |
2 files changed, 54 insertions, 0 deletions
diff --git a/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch b/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch new file mode 100644 index 0000000000..3932ddb949 --- /dev/null +++ b/libraries/wvstreams/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch @@ -0,0 +1,50 @@ +From 32ecfa8e89306ace726f7ad14f2b09c2aa1b96c4 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <msekleta@redhat.com> +Date: Tue, 9 Feb 2016 21:02:59 +0100 +Subject: [PATCH] Use explicit cast and prevent compiler error + +--- + streams/wvstream.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/streams/wvstream.cc b/streams/wvstream.cc +index 4564f3c..76565b4 100644 +--- a/streams/wvstream.cc ++++ b/streams/wvstream.cc +@@ -907,9 +907,9 @@ void WvStream::_build_selectinfo(SelectInfo &si, time_t msec_timeout, + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast<bool>(readcb); ++ si.wants.writable = static_cast<bool>(writecb); ++ si.wants.isexception = static_cast<bool>(exceptcb); + } + else + { +@@ -1019,7 +1019,7 @@ bool WvStream::_select(time_t msec_timeout, bool readable, bool writable, + + IWvStream::SelectRequest WvStream::get_select_request() + { +- return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb)); + } + + +@@ -1107,7 +1107,10 @@ bool WvStream::continue_select(time_t msec_timeout) + // inefficient, because if the alarm was expired then pre_select() + // returned true anyway and short-circuited the previous select(). + TRACE("hello-%p\n", this); +- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); ++ return !alarm_was_ticking || select(0, ++ static_cast<bool>(readcb), ++ static_cast<bool>(writecb), ++ static_cast<bool>(exceptcb)); + } + + +-- +2.5.0 + diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild index 562bb05d11..ba96227003 100644 --- a/libraries/wvstreams/wvstreams.SlackBuild +++ b/libraries/wvstreams/wvstreams.SlackBuild @@ -59,6 +59,10 @@ patch -p1 < $CWD/patches/wvstreams-4.6.1-parallel-make.patch patch -p1 < $CWD/patches/wvstreams-4.6.1-gcc47.patch # another patch for gcc and glibc > 2.12.0 from debian patch -p1 < $CWD/patches/05_gcc.diff +# another one for gcc-6.x from fedora +patch -p1 < $CWD/patches/0001-Use-explicit-cast-and-prevent-compiler-error.patch +# disable a warning (just for readability during build) +sed -i "s|_BSD_SOURCE|_DEFAULT_SOURCE|" wvrules.mk # configure doesn't support disabling static libraries # Don't manually remove them either, as wvdial won't build then :) |