diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-22 19:59:41 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-22 19:59:41 +0000 |
| commit | ca21823b65ea22aea7534e28a607f7b7d2fdcff6 (patch) | |
| tree | 17c54ee81284568526278b3357e355cf65710ca2 /net/libproxy/files/patch-libproxy_test_get-pac-test.cpp | |
| parent | x11/qterminal: Update to 0.9.0 (diff) | |
Update net/libproxy to 0.4.15
* this release switched the build system to cmake
* move libproxy-gnome to libproxy-gnome2 for consistency
* add new slave libproxy-webkit3
* try to simplify the whole thing
* bump revisions in the dependencies
Reviewed by: gnome (kwm), mat
Differential Revision: https://reviews.freebsd.org/D15655
Notes
Notes:
svn path=/head/; revision=473062
Diffstat (limited to 'net/libproxy/files/patch-libproxy_test_get-pac-test.cpp')
| -rw-r--r-- | net/libproxy/files/patch-libproxy_test_get-pac-test.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp b/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp index 963f8f56b6f8..8baef77dae6d 100644 --- a/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp +++ b/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp @@ -1,12 +1,15 @@ +First hunk: libc++ doesn't like "using namespace std" in C++11 libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned long>' ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Second hunk: +Fix typo. ---- libproxy/test/get-pac-test.cpp.orig 2016-01-12 16:41:07 UTC -+++ libproxy/test/get-pac-test.cpp -@@ -45,7 +45,7 @@ class TestServer { +--- libproxy/test/get-pac-test.cpp.orig 2017-05-11 11:33:33.000000000 +0200 ++++ libproxy/test/get-pac-test.cpp 2018-06-02 14:32:22.796000000 +0200 +@@ -52,7 +52,7 @@ setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); @@ -15,3 +18,12 @@ libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatibl assert(!ret); ret = listen(m_sock, 1); +@@ -130,7 +130,7 @@ + + #ifdef SO_NOSIGPIPE + int i = 1; +- setsockopt(c_sock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)); ++ setsockopt(csock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)); + #endif + + // Read request |