early-access version 2853
This commit is contained in:
pineappleEA
14
externals/vcpkg/ports/libproxy/fix-arm-build.patch
vendored
Executable file
14
externals/vcpkg/ports/libproxy/fix-arm-build.patch
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
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)
|
||||
52
externals/vcpkg/ports/libproxy/fix-dependency-libmodman.patch
vendored
Executable file
52
externals/vcpkg/ports/libproxy/fix-dependency-libmodman.patch
vendored
Executable file
@@ -0,0 +1,52 @@
|
||||
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})
|
||||
36
externals/vcpkg/ports/libproxy/fix-install-py.patch
vendored
Executable file
36
externals/vcpkg/ports/libproxy/fix-install-py.patch
vendored
Executable file
@@ -0,0 +1,36 @@
|
||||
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/python/python2/CMakeLists.txt b/bindings/python/python2/CMakeLists.txt
|
||||
index 00df551..15d78f9 100644
|
||||
--- a/bindings/python/python2/CMakeLists.txt
|
||||
+++ b/bindings/python/python2/CMakeLists.txt
|
||||
@@ -21,5 +21,4 @@ if(PYTHON2INTERP_FOUND)
|
||||
|
||||
message(STATUS "Using PYTHON2_SITEPKG_DIR=${PYTHON2_SITEPKG_DIR}")
|
||||
|
||||
- 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 "")
|
||||
|
||||
-install( TARGETS PLlibproxy DESTINATION ${PX_PERL_ARCH}/auto/Net/Libproxy )
|
||||
13
externals/vcpkg/ports/libproxy/fix-module-lib-name.patch
vendored
Executable file
13
externals/vcpkg/ports/libproxy/fix-module-lib-name.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in
|
||||
index ef44489..c0bd2ae 100644
|
||||
--- a/libproxy/Findlibproxy.cmake.in
|
||||
+++ b/libproxy/Findlibproxy.cmake.in
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
# Find proxy.h and the corresponding library (libproxy.so)
|
||||
FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h )
|
||||
-FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy )
|
||||
+FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy libproxy)
|
||||
|
||||
# Set library version
|
||||
SET(LIBPROXY_VERSION @PROJECT_VERSION@)
|
||||
27
externals/vcpkg/ports/libproxy/fix-tools-path.patch
vendored
Executable file
27
externals/vcpkg/ports/libproxy/fix-tools-path.patch
vendored
Executable file
@@ -0,0 +1,27 @@
|
||||
diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk
|
||||
index bbbd989..956948a 100644
|
||||
--- a/libproxy/cmake/pxmodule.cmk
|
||||
+++ b/libproxy/cmake/pxmodule.cmk
|
||||
@@ -20,7 +20,7 @@ function(px_module name build builtin)
|
||||
add_library(${name} MODULE modules/${name}.cpp)
|
||||
target_link_libraries(${name} libproxy)
|
||||
set_target_properties(${name} PROPERTIES PREFIX "")
|
||||
- install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR})
|
||||
+ install(TARGETS ${name} LIBRARY DESTINATION tools)
|
||||
if(${ARGC} GREATER 3)
|
||||
target_link_libraries(${name} ${ARGN})
|
||||
endif()
|
||||
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
|
||||
index 52010c6..0a3f4b5 100644
|
||||
--- a/utils/CMakeLists.txt
|
||||
+++ b/utils/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
include_directories("../libproxy")
|
||||
|
||||
+if (BUILD_TOOLS)
|
||||
add_executable(proxy proxy.c)
|
||||
target_link_libraries(proxy libproxy)
|
||||
-install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR})
|
||||
+install(TARGETS proxy RUNTIME DESTINATION tools)
|
||||
+endif()
|
||||
\ No newline at end of file
|
||||
54
externals/vcpkg/ports/libproxy/portfile.cmake
vendored
Executable file
54
externals/vcpkg/ports/libproxy/portfile.cmake
vendored
Executable file
@@ -0,0 +1,54 @@
|
||||
# Enable static build in UNIX
|
||||
if (VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libproxy/libproxy
|
||||
REF e78a5ccfe0a2340f2c73e419767f8492ffc2787a #0.4.17
|
||||
SHA512 b22251f73f7a94dade5dcdcd9d5510170038b0d101ee98ab427106c20a3d9979c2b16c57d6cf8d8ae59c3a28ccffcecafc0bed399926dc2416a27837fd2f043c
|
||||
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
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
bindings-csharp WITH_DOTNET
|
||||
bindings-python WITH_PYTHON2
|
||||
bindings-python WITH_PYTHON3
|
||||
bindings-perl WITH_PERL
|
||||
bindings-vala WITH_VALA
|
||||
tools BUILD_TOOLS
|
||||
tests BUILD_TESTING
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
-DWITH_WEBKIT3=OFF
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
WITH_DOTNET
|
||||
WITH_PERL
|
||||
WITH_PYTHON2
|
||||
WITH_PYTHON3
|
||||
WITH_VALA
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules)
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
|
||||
"${CMAKE_CURRENT_LIST_DIR}/usage"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
31
externals/vcpkg/ports/libproxy/support-windows.patch
vendored
Executable file
31
externals/vcpkg/ports/libproxy/support-windows.patch
vendored
Executable file
@@ -0,0 +1,31 @@
|
||||
diff --git a/cmake/paths.cmk b/cmake/paths.cmk
|
||||
index 593ebc1..bbf8754 100644
|
||||
--- a/cmake/paths.cmk
|
||||
+++ b/cmake/paths.cmk
|
||||
@@ -1,4 +1,4 @@
|
||||
-if(WIN32 AND NOT MINGW)
|
||||
+if(0)
|
||||
set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install prefix")
|
||||
set(BIN_INSTALL_DIR . CACHE PATH "Binary install dir")
|
||||
set(LIB_INSTALL_DIR . CACHE PATH "Library install dir")
|
||||
diff --git a/libproxy/cmake/devfiles.cmk b/libproxy/cmake/devfiles.cmk
|
||||
index 0301dce..0eb5f83 100644
|
||||
--- a/libproxy/cmake/devfiles.cmk
|
||||
+++ b/libproxy/cmake/devfiles.cmk
|
||||
@@ -1,4 +1,4 @@
|
||||
-if(NOT WIN32 OR MINGW)
|
||||
+if(1)
|
||||
# PkgConfig file
|
||||
set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
|
||||
|
||||
diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk
|
||||
index de68e5c..9356486 100644
|
||||
--- a/libproxy/cmake/libproxy.cmk
|
||||
+++ b/libproxy/cmake/libproxy.cmk
|
||||
@@ -24,5 +24,5 @@ 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()
|
||||
-install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
|
||||
+install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
|
||||
5
externals/vcpkg/ports/libproxy/usage
vendored
Executable file
5
externals/vcpkg/ports/libproxy/usage
vendored
Executable file
@@ -0,0 +1,5 @@
|
||||
The package libproxy provides CMake targets:
|
||||
|
||||
find_package(libproxy CONFIG REQUIRED)
|
||||
target_include_directories(main PRIVATE ${LIBPROXY_INCLUDE_DIR})
|
||||
target_link_libraries(main PRIVATE ${LIBPROXY_LIBRARIES})
|
||||
6
externals/vcpkg/ports/libproxy/vcpkg-cmake-wrapper.cmake
vendored
Executable file
6
externals/vcpkg/ports/libproxy/vcpkg-cmake-wrapper.cmake
vendored
Executable file
@@ -0,0 +1,6 @@
|
||||
set(LIBPROXY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
_find_package(${ARGS})
|
||||
|
||||
set(CMAKE_MODULE_PATH ${LIBPROXY_PREV_MODULE_PATH})
|
||||
43
externals/vcpkg/ports/libproxy/vcpkg.json
vendored
Executable file
43
externals/vcpkg/ports/libproxy/vcpkg.json
vendored
Executable file
@@ -0,0 +1,43 @@
|
||||
{
|
||||
"name": "libproxy",
|
||||
"version": "0.4.17",
|
||||
"port-version": 3,
|
||||
"description": "libproxy is a library that provides automatic proxy configuration management.",
|
||||
"homepage": "https://github.com/libproxy/libproxy",
|
||||
"license": "LGPL-2.1-only",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"libmodman",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"bindings-csharp": {
|
||||
"description": "Install C# bindings"
|
||||
},
|
||||
"bindings-perl": {
|
||||
"description": "Install PERL bindings"
|
||||
},
|
||||
"bindings-python": {
|
||||
"description": "Install Python bindings"
|
||||
},
|
||||
"bindings-ruby": {
|
||||
"description": "Install Ruby bindings"
|
||||
},
|
||||
"bindings-vala": {
|
||||
"description": "Install Vala bindings"
|
||||
},
|
||||
"tests": {
|
||||
"description": "Build libproxy tests"
|
||||
},
|
||||
"tools": {
|
||||
"description": "build tools"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user