diff --git a/ports/libproxy/fix-arm-build.patch b/ports/libproxy/fix-arm-build.patch deleted file mode 100644 index c334b8b99a..0000000000 --- a/ports/libproxy/fix-arm-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c68939..9ef6895 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,6 +42,9 @@ else() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - endif() - -+if (WIN32) -+ link_libraries(Advapi32) -+endif() - # Conditionally build bindings - if(NOT WIN32) - add_subdirectory(bindings) diff --git a/ports/libproxy/fix-dependency-libmodman.patch b/ports/libproxy/fix-dependency-libmodman.patch deleted file mode 100644 index 84a17411bc..0000000000 --- a/ports/libproxy/fix-dependency-libmodman.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f51e38..32a0319 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,11 +31,15 @@ include(cmake/ctest.cmk) - include(cmake/paths.cmk) - - option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) -- --### Subdirectories -- --add_subdirectory(libmodman) --include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -+find_package(libmodman REQUIRED) -+if(LIBMODMAN_FOUND) -+ include_directories(${LIBMODMAN_INCLUDE_DIR}) -+ link_libraries(${LIBMODMAN_LIBRARIES}) -+else() -+ ### Subdirectories -+ add_subdirectory(libmodman) -+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -+endif() - - # Conditionally build bindings - if(NOT WIN32) -diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk -index 9356486..f9eed2c 100644 ---- a/libproxy/cmake/libproxy.cmk -+++ b/libproxy/cmake/libproxy.cmk -@@ -1,8 +1,8 @@ - add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES}) - if(WIN32) -- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES}) -+ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};ws2_32;${LIBPROXY_LIBRARIES}) - else() -- target_link_libraries(libproxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) -+ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) - endif() - file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR) - if(WIN32) -@@ -21,8 +21,8 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) - set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") - set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") --if(NOT APPLE) -- set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") --endif() -+#if(NOT APPLE) -+# set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") -+#endif() - install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/ports/libproxy/fix-install-py.patch b/ports/libproxy/fix-install-py.patch index c429be74b0..c4a630b97c 100644 --- a/ports/libproxy/fix-install-py.patch +++ b/ports/libproxy/fix-install-py.patch @@ -1,15 +1,22 @@ -diff --git a/bindings/python/python3/CMakeLists.txt b/bindings/python/python3/CMakeLists.txt -index bf87dfc..9f94c2d 100644 ---- a/bindings/python/python3/CMakeLists.txt -+++ b/bindings/python/python3/CMakeLists.txt -@@ -21,5 +21,4 @@ if(PYTHON3INTERP_FOUND) - - message(STATUS "Using PYTHON3_SITEPKG_DIR=${PYTHON3_SITEPKG_DIR}") - -- install(FILES ../libproxy.py DESTINATION ${PYTHON3_SITEPKG_DIR}) - endif() +diff --git a/bindings/perl/lib/CMakeLists.txt b/bindings/perl/lib/CMakeLists.txt +index 7c36e51..ee2c5bc 100644 +--- a/bindings/perl/lib/CMakeLists.txt ++++ b/bindings/perl/lib/CMakeLists.txt +@@ -1,2 +1 @@ + add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/Net/Libproxy.pm) +-install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net ) +diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt +index 2800a85..c5d8e0f 100644 +--- a/bindings/perl/src/CMakeLists.txt ++++ b/bindings/perl/src/CMakeLists.txt +@@ -21,5 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) + target_compile_options(PLlibproxy PRIVATE ${PX_PERL_CCFLAGS}) + set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") + set_target_properties(PLlibproxy PROPERTIES PREFIX "") +- +-install( TARGETS PLlibproxy DESTINATION ${PX_PERL_ARCH}/auto/Net/Libproxy ) diff --git a/bindings/python/python2/CMakeLists.txt b/bindings/python/python2/CMakeLists.txt -index 00df551..15d78f9 100644 +index f4d2b91..a79decc 100644 --- a/bindings/python/python2/CMakeLists.txt +++ b/bindings/python/python2/CMakeLists.txt @@ -21,5 +21,4 @@ if(PYTHON2INTERP_FOUND) @@ -18,19 +25,13 @@ index 00df551..15d78f9 100644 - install(FILES ../libproxy.py DESTINATION ${PYTHON2_SITEPKG_DIR}) endif() -diff --git a/bindings/perl/lib/CMakeLists.txt b/bindings/perl/lib/CMakeLists.txt -index 9856627..f54c138 100644 ---- a/bindings/perl/lib/CMakeLists.txt -+++ b/bindings/perl/lib/CMakeLists.txt -@@ -1,2 +1 @@ - add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/blib/lib/Libproxy.pm) --install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net ) -diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt -index 05176c4..9ca532f 100644 ---- a/bindings/perl/src/CMakeLists.txt -+++ b/bindings/perl/src/CMakeLists.txt -@@ -21,4 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) - set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") - set_target_properties(PLlibproxy PROPERTIES PREFIX "") +diff --git a/bindings/python/python3/CMakeLists.txt b/bindings/python/python3/CMakeLists.txt +index fc3b24b..a13b6b7 100644 +--- a/bindings/python/python3/CMakeLists.txt ++++ b/bindings/python/python3/CMakeLists.txt +@@ -21,5 +21,4 @@ if(PYTHON3INTERP_FOUND) + + message(STATUS "Using PYTHON3_SITEPKG_DIR=${PYTHON3_SITEPKG_DIR}") --install( TARGETS PLlibproxy DESTINATION ${PX_PERL_ARCH}/auto/Net/Libproxy ) +- install(FILES ../libproxy.py DESTINATION ${PYTHON3_SITEPKG_DIR}) + endif() diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index fa77869158..0b972082c2 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -1,20 +1,18 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libproxy/libproxy - REF e78a5ccfe0a2340f2c73e419767f8492ffc2787a #0.4.17 - SHA512 b22251f73f7a94dade5dcdcd9d5510170038b0d101ee98ab427106c20a3d9979c2b16c57d6cf8d8ae59c3a28ccffcecafc0bed399926dc2416a27837fd2f043c + REF 8fec01ed4b95afc71bf7710bf5b736a5de03b343 #0.4.18 + SHA512 6367d21b8816d7e5e3c75ee124c230ec89abbffa09538b6700c9ae61be33629f864617f51a2317e18d2fb960b09e26cae0e3503d747112f23921d1910856b109 HEAD_REF master PATCHES fix-tools-path.patch support-windows.patch - fix-dependency-libmodman.patch fix-install-py.patch - fix-arm-build.patch fix-module-lib-name.patch ) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES bindings-csharp WITH_DOTNET @@ -30,6 +28,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DWITH_WEBKIT3=OFF + -DWITH_KDE=${VCPKG_TARGET_IS_LINUX} + -DMSVC_STATIC=${STATICCRT} MAYBE_UNUSED_VARIABLES WITH_DOTNET WITH_PERL diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index c00654e0cf..a65c413e81 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,13 +1,11 @@ { "name": "libproxy", - "version": "0.4.17", - "port-version": 5, + "version": "0.4.18", "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", - "supports": "!uwp & !staticcrt", + "supports": "!uwp", "dependencies": [ - "libmodman", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index b14dab1f64..d9f7461e75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4121,8 +4121,8 @@ "port-version": 0 }, "libproxy": { - "baseline": "0.4.17", - "port-version": 5 + "baseline": "0.4.18", + "port-version": 0 }, "libqcow": { "baseline": "20210419", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 59eb959456..e469d398d7 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e70cf451a9b90297ce32751eb17760a31c0b394", + "version": "0.4.18", + "port-version": 0 + }, { "git-tree": "657915bf898e4e4ccf08b6274665b541efa15876", "version": "0.4.17",