From 5e7e48d7f2c401253786e4614a6493805287c956 Mon Sep 17 00:00:00 2001 From: Francisco Pombal Date: Fri, 21 Aug 2020 23:48:19 +0100 Subject: [PATCH] [libtorrent] bump version and adjust python patch (#12946) --- ports/libtorrent/CONTROL | 2 +- ports/libtorrent/fix_python_cmake.patch | 26 ++++++++++++------------- ports/libtorrent/portfile.cmake | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 48505d85a5..c8405288bd 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,5 +1,5 @@ Source: libtorrent -Version: 1.2.8 +Version: 1.2.9 Homepage: https://github.com/arvidn/libtorrent Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-variant diff --git a/ports/libtorrent/fix_python_cmake.patch b/ports/libtorrent/fix_python_cmake.patch index 942b8e3b8a..f114b8621a 100644 --- a/ports/libtorrent/fix_python_cmake.patch +++ b/ports/libtorrent/fix_python_cmake.patch @@ -1,5 +1,5 @@ diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt -index 0b9b3ebe7..74e608901 100644 +index 53e09439f..de027f965 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -1,7 +1,6 @@ @@ -26,7 +26,7 @@ index 0b9b3ebe7..74e608901 100644 list(APPEND _tmp 3.5 3.6 3.7 3.8) endif() set(${_ret} ${_tmp} PARENT_SCOPE) -@@ -31,31 +27,26 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND NOT skip-python-runtime-test) +@@ -31,23 +27,22 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND NOT skip-python-runtime-test) _get_compatible_python_versions(Python_ADDITIONAL_VERSIONS) endif() @@ -48,15 +48,15 @@ index 0b9b3ebe7..74e608901 100644 if (NOT boost-python-module-name) # use active python -- if (PYTHON_VERSION_STRING VERSION_GREATER_EQUAL "3") -- set(_boost-python-module-name "python${PYTHON_VERSION_MAJOR}") -- else() + # if (PYTHON_VERSION_STRING VERSION_GREATER_EQUAL "3") + # set(_boost-python-module-name "python${PYTHON_VERSION_MAJOR}") + # else() - set(_boost-python-module-name "python") # to overwrite possible value from a previous run -- endif() -+ set(_boost-python-module-name "python${Python3_VERSION_MAJOR}") ++ set(_boost-python-module-name "python${Python3_VERSION_MAJOR}") # to overwrite possible value from a previous run + # endif() endif() - set(boost-python-module-name ${_boost-python-module-name} CACHE STRING "Boost:python module name, e.g. 'pythom-3.6'") +@@ -55,7 +50,7 @@ set(boost-python-module-name ${_boost-python-module-name} CACHE STRING "Boost:py find_package(Boost REQUIRED COMPONENTS ${boost-python-module-name}) @@ -65,7 +65,7 @@ index 0b9b3ebe7..74e608901 100644 src/module.cpp src/sha1_hash.cpp src/converters.cpp -@@ -80,12 +71,12 @@ python_add_module(python-libtorrent +@@ -80,12 +75,12 @@ python_add_module(python-libtorrent set_target_properties(python-libtorrent PROPERTIES @@ -80,7 +80,7 @@ index 0b9b3ebe7..74e608901 100644 ) string(TOUPPER "${boost-python-module-name}" boost_python_module_name_uppercase) -@@ -96,7 +87,7 @@ target_link_libraries(python-libtorrent +@@ -96,7 +91,7 @@ target_link_libraries(python-libtorrent # Boost::python adds that but without a path to the library. Therefore we have to either # provide the path (but, unfortunately, FindPythonLibs.cmake does not return the library dir), # or give the full file name here (this FindPythonLibs.cmake provides to us). @@ -89,7 +89,7 @@ index 0b9b3ebe7..74e608901 100644 ) # Bindings module uses deprecated libtorrent features, thus we disable these warnings -@@ -108,7 +99,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +@@ -108,7 +103,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") endif() execute_process(COMMAND @@ -98,7 +98,7 @@ index 0b9b3ebe7..74e608901 100644 print(';'.join(map(str, [ distutils.sysconfig.get_python_lib(plat_specific=True, prefix=''), distutils.sysconfig.get_config_var('EXT_SUFFIX') -@@ -119,13 +110,11 @@ list(GET _python_sysconfig_vars 0 PYTHON_SITE_PACKAGES) +@@ -119,13 +114,11 @@ list(GET _python_sysconfig_vars 0 PYTHON_SITE_PACKAGES) list(GET _python_sysconfig_vars 1 PYTHON_EXT_SUFFIX) message(STATUS "Python site packages: ${PYTHON_SITE_PACKAGES}") @@ -117,7 +117,7 @@ index 0b9b3ebe7..74e608901 100644 set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake.in") set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py") -@@ -135,8 +124,8 @@ set(DEPS python-libtorrent "${SETUP_PY}") +@@ -135,8 +128,8 @@ set(DEPS python-libtorrent "${SETUP_PY}") configure_file(${SETUP_PY_IN} ${SETUP_PY} @ONLY) add_custom_command(OUTPUT ${OUTPUT} diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index e88ddf7cc2..1f3b76e5a3 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -39,8 +39,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF libtorrent-1.2.8 - SHA512 2a36412fb399f066de9768f4afd87ddbfc10fcd2a0b3a8be0a43bec6914497e71d9d4ffe4ff8ccc5544a048f799ccba6ce086ab6199f4dee66d1341f02d73f9a + REF libtorrent-1.2.9 + SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8 HEAD_REF RC_1_2 PATCHES add-datetime-to-boost-libs.patch