From 1414d3b7ba149f6e802b334339f13d899c809135 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 5 Dec 2020 11:11:30 +0000 Subject: [PATCH] Update to libproxy-0.4.16. Add debug packages. --- net/libproxy/Makefile | 15 ++++++++------- net/libproxy/distinfo | 4 ++-- .../patches/patch-libproxy_CMakeLists_txt | 4 ++-- net/libproxy/patches/patch-libproxy_url_cpp | 11 ++++++----- net/libproxy/pkg/PLIST-main | 9 +++++---- net/libproxy/pkg/PLIST-webkit | 4 ++-- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile index c7bca4809e9..bace3fe9b31 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -1,17 +1,15 @@ -# $OpenBSD: Makefile,v 1.65 2020/07/03 21:12:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.66 2020/12/05 11:11:30 ajacoutot Exp $ COMMENT-main= library handling all the details of proxy configuration COMMENT-webkit= pacrunner libproxy plugin for webkit-based browsers GH_ACCOUNT= libproxy GH_PROJECT= libproxy -GH_TAGNAME= 0.4.15 +GH_TAGNAME= 0.4.16 SUBST_VARS= GH_TAGNAME PKGNAME-main= ${DISTNAME} PKGNAME-webkit= ${GH_PROJECT}-webkit-${GH_TAGNAME} -REVISION-main= 5 -REVISION-webkit= 3 CATEGORIES= net @@ -41,7 +39,8 @@ MULTI_PACKAGES= -main -webkit BUILD_DEPENDS= lang/vala RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} -LIB_DEPENDS-main= devel/glib2 +LIB_DEPENDS-main= devel/glib2 \ + x11/dbus RUN_DEPENDS-webkit= # empty LIB_DEPENDS-webkit= STEM->=${GH_TAGNAME}:${BUILD_PKGPATH}, \ @@ -50,11 +49,11 @@ LIB_DEPENDS-webkit= STEM->=${GH_TAGNAME}:${BUILD_PKGPATH}, \ WANTLIB += intl m ${COMPILER_LIBCXX} WANTLIB-main += ${WANTLIB} -WANTLIB-main += c gio-2.0 glib-2.0 gobject-2.0 perl pthread +WANTLIB-main += c dbus-1 gio-2.0 glib-2.0 gobject-2.0 perl pthread WANTLIB-main += perl # uses perl ABI WANTLIB-webkit += ${WANTLIB} -WANTLIB-webkit += glib-2.0 javascriptcoregtk-4.0 proxy pthread +WANTLIB-webkit += glib-2.0 gobject-2.0 javascriptcoregtk-4.0 proxy pthread CONFIGURE_ENV= LIBlibproxy_VERSION=${LIBproxy_VERSION} MAKE_ENV= LIBlibproxy_VERSION=${LIBproxy_VERSION} @@ -78,4 +77,6 @@ CONFIGURE_ARGS += -DWITH_WEBKIT3:BOOL=ON CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=OFF .endif +DEBUG_PACKAGES= ${BUILD_PACKAGES} + .include diff --git a/net/libproxy/distinfo b/net/libproxy/distinfo index a1ba4f16fa1..b5ea13a35ba 100644 --- a/net/libproxy/distinfo +++ b/net/libproxy/distinfo @@ -1,2 +1,2 @@ -SHA256 (libproxy-0.4.15.tar.gz) = GPWLCgBDtogXdBh0J+rRWNMQEn/EahxmitbSB/sotOA= -SIZE (libproxy-0.4.15.tar.gz) = 93084 +SHA256 (libproxy-0.4.16.tar.gz) = nnlZ1q4dbIF/CsHiUxBc6NmfVdeCHBturvMr9oecbwo= +SIZE (libproxy-0.4.16.tar.gz) = 95534 diff --git a/net/libproxy/patches/patch-libproxy_CMakeLists_txt b/net/libproxy/patches/patch-libproxy_CMakeLists_txt index 03155f03267..730dab74c93 100644 --- a/net/libproxy/patches/patch-libproxy_CMakeLists_txt +++ b/net/libproxy/patches/patch-libproxy_CMakeLists_txt @@ -1,4 +1,4 @@ -$OpenBSD: patch-libproxy_CMakeLists_txt,v 1.7 2017/05/12 07:12:10 ajacoutot Exp $ +$OpenBSD: patch-libproxy_CMakeLists_txt,v 1.8 2020/12/05 11:11:30 ajacoutot Exp $ Adding -pthread: https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244 @@ -10,7 +10,7 @@ https://svnweb.freebsd.org/ports/head/net/libproxy/files/patch-libproxy_CMakeLis Index: libproxy/CMakeLists.txt --- libproxy/CMakeLists.txt.orig +++ libproxy/CMakeLists.txt -@@ -6,8 +6,7 @@ set_project_version(0 4 15) +@@ -6,8 +6,7 @@ set_project_version(0 4 16) if (WIN32) add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) else(WIN32) diff --git a/net/libproxy/patches/patch-libproxy_url_cpp b/net/libproxy/patches/patch-libproxy_url_cpp index 53f5d9ef087..f278fea440d 100644 --- a/net/libproxy/patches/patch-libproxy_url_cpp +++ b/net/libproxy/patches/patch-libproxy_url_cpp @@ -1,10 +1,11 @@ -$OpenBSD: patch-libproxy_url_cpp,v 1.5 2017/01/11 08:41:32 ajacoutot Exp $ +$OpenBSD: patch-libproxy_url_cpp,v 1.6 2020/12/05 11:11:30 ajacoutot Exp $ https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244 ---- libproxy/url.cpp.orig Mon Jan 9 15:22:22 2017 -+++ libproxy/url.cpp Wed Jan 11 09:31:58 2017 -@@ -46,6 +46,10 @@ +Index: libproxy/url.cpp +--- libproxy/url.cpp.orig ++++ libproxy/url.cpp +@@ -45,6 +45,10 @@ using namespace libproxy; using namespace std; @@ -15,7 +16,7 @@ https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244 // This mime type should be reported by the web server #define PAC_MIME_TYPE "application/x-ns-proxy-autoconfig" // Fall back to checking for this mime type, which servers often report wrong -@@ -59,14 +63,22 @@ using namespace std; +@@ -58,14 +62,22 @@ using namespace std; static inline int get_default_port(string scheme) { struct servent *serv; size_t plus = scheme.find('+'); diff --git a/net/libproxy/pkg/PLIST-main b/net/libproxy/pkg/PLIST-main index b8c00386e2f..accc938d097 100644 --- a/net/libproxy/pkg/PLIST-main +++ b/net/libproxy/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.8 2016/01/19 16:16:38 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.9 2020/12/05 11:11:30 ajacoutot Exp $ @conflict libproxy-gnome-* @pkgpath net/libproxy,-gnome @bin bin/proxy @@ -7,8 +7,9 @@ lib/libproxy/ @lib lib/libproxy.so.${LIBproxy_VERSION} lib/libproxy/${GH_TAGNAME}/ lib/libproxy/${GH_TAGNAME}/modules/ -lib/libproxy/${GH_TAGNAME}/modules/config_gnome3.so -lib/libproxy/${GH_TAGNAME}/modules/config_kde.so +@so lib/libproxy/${GH_TAGNAME}/modules/config_gnome3.so +@so lib/libproxy/${GH_TAGNAME}/modules/config_kde.so +@so lib/libproxy/${GH_TAGNAME}/modules/config_pacrunner.so lib/pkgconfig/libproxy-1.0.pc lib/python${MODPY_VERSION}/site-packages/libproxy.py libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ @@ -17,7 +18,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Net/Libproxy.pm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/ -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/Libproxy.so +@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/Libproxy.so @bin libexec/pxgsettings share/cmake/ share/cmake/Modules/ diff --git a/net/libproxy/pkg/PLIST-webkit b/net/libproxy/pkg/PLIST-webkit index 1784ed5d6b4..5aadfec7d21 100644 --- a/net/libproxy/pkg/PLIST-webkit +++ b/net/libproxy/pkg/PLIST-webkit @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-webkit,v 1.4 2016/01/19 16:16:38 ajacoutot Exp $ -lib/libproxy/${GH_TAGNAME}/modules/pacrunner_webkit.so +@comment $OpenBSD: PLIST-webkit,v 1.5 2020/12/05 11:11:30 ajacoutot Exp $ +@so lib/libproxy/${GH_TAGNAME}/modules/pacrunner_webkit.so