diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-02-01 20:28:09 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-02-01 20:28:09 +0800 |
| commit | 94c151947f77646e69c37af973843e62fa89a56a (patch) | |
| tree | 7baa5bc9ce0b9aab8c8dc935bd0ca58359733505 | |
| parent | 8d6d91cf1a7e7511189f02d762a73459879877d1 (diff) | |
| download | freebsd-ports-gnome-94c151947f77646e69c37af973843e62fa89a56a.tar.gz freebsd-ports-gnome-94c151947f77646e69c37af973843e62fa89a56a.tar.zst freebsd-ports-gnome-94c151947f77646e69c37af973843e62fa89a56a.zip | |
audio/muse: unbreak with libc++ 3.9
httpstream.cpp:366:4: error: assigning to 'char *' from incompatible type 'const char *'
p = strstr(url, HTTP_PREFIX); if (!p) goto out;
^ ~~~~~~~~~~~~~~~~~~~~~~~~
Reported by: pkg-fallout
| -rw-r--r-- | audio/muse/Makefile | 2 | ||||
| -rw-r--r-- | audio/muse/files/patch-src_httpstream.cpp | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/audio/muse/Makefile b/audio/muse/Makefile index 3dda94ebc5ce..f2523e2e18e7 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -3,7 +3,7 @@ PORTNAME= MuSE PORTVERSION= 0.9.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= audio MASTER_SITES= https://files.dyne.org/muse/sources/ diff --git a/audio/muse/files/patch-src_httpstream.cpp b/audio/muse/files/patch-src_httpstream.cpp new file mode 100644 index 000000000000..216e106d0b41 --- /dev/null +++ b/audio/muse/files/patch-src_httpstream.cpp @@ -0,0 +1,22 @@ +--- src/httpstream.cpp.orig 2005-12-27 14:26:06 UTC ++++ src/httpstream.cpp +@@ -356,6 +356,7 @@ http_open( const char *url ) + { + int sock = INVALID_SOCKET; + FILE *fd = NULL; ++ const char *hp = NULL; + char *host=NULL, *file=NULL, *p; + int port = 0; + +@@ -363,9 +364,8 @@ http_open( const char *url ) + file = (char*)calloc( 1, strlen(url)+1 ); + if (!host || !file) goto out; + +- p = strstr(url, HTTP_PREFIX); if (!p) goto out; +- p += 7; +- strcpy(host, p); ++ hp = strstr(url, HTTP_PREFIX); if (!hp) goto out; ++ strcpy(host, hp + 7); + + p = strchr(host, '/'); + if (p) { |