diff options
| author | koobs <koobs@FreeBSD.org> | 2018-10-07 18:29:06 +0800 |
|---|---|---|
| committer | koobs <koobs@FreeBSD.org> | 2018-10-07 18:29:06 +0800 |
| commit | 294abdfef098ebf4e7c19c99a3ff02d3482cfc51 (patch) | |
| tree | 151ca96925af5753b88583d011920fa3952eae83 /comms | |
| parent | e6c3db04ff44ba353b517d885b4e81629ad24287 (diff) | |
| download | freebsd-ports-gnome-294abdfef098ebf4e7c19c99a3ff02d3482cfc51.tar.gz freebsd-ports-gnome-294abdfef098ebf4e7c19c99a3ff02d3482cfc51.tar.zst freebsd-ports-gnome-294abdfef098ebf4e7c19c99a3ff02d3482cfc51.zip | |
comms/hylafax: Fix build with Clang 6 (and GCC7)
Add patch from upstream HylaFAX+, fixing a Clang 6 (and GCC7) build error:
FaxRecvInfo.c++:115:17: error: comparison between pointer and integer ('const char *' and 'int')
while (cp+2 != '\0') {
~~~~ ^ ~~~~
[1] http://bugs.hylafax.org/show_bug.cgi?id=971
[2] https://sourceforge.net/p/hylafax/HylaFAX+/2417/
[3] See Also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853448
PR: 225372
Reported by: O. Hartmann <ohartmann walstatt org>
Obtained from: HylaFAX+ [2]
MFH: 2018Q4
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/hylafax/Makefile | 2 | ||||
| -rw-r--r-- | comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 2acc8b907328..1a862a589bfb 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -3,7 +3,7 @@ PORTNAME= hylafax PORTVERSION= 6.0.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms MASTER_SITES= ftp://ftp.hylafax.org/source/ diff --git a/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ b/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ new file mode 100644 index 000000000000..1f6006e1d44a --- /dev/null +++ b/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ @@ -0,0 +1,16 @@ +PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225372 +Upstream: http://bugs.hylafax.org/show_bug.cgi?id=971 +Obtained from: https://sourceforge.net/p/hylafax/HylaFAX+/2417/ +See Also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853448 + +--- libhylafax/FaxRecvInfo.c++.orig 2018-10-07 07:40:23 UTC ++++ libhylafax/FaxRecvInfo.c++ +@@ -112,7 +112,7 @@ FaxRecvInfo::decode(const char* cp) + if (cp == NULL || cp[1] != ',' || cp[2] != '"') + return (false); + u_int i = 0; +- while (cp+2 != '\0') { ++ while (*(cp+2) != '\0') { + callid[i] = cp+3; // +1 for "/+1 for ,/+1 for " + if (*cp == '\"') break; + callid[i].resize(callid[i].next(0,'"')); |