Bump pyqtbuilder

open-vcpkg · May 12, 2024 · 86778a2 · 86778a2
1 parent 41c7e1b
commit 86778a2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/ports/py-pyqt-builder/portfile.cmake b/ports/py-pyqt-builder/portfile.cmake
@@ -1,8 +1,9 @@
 vcpkg_from_pythonhosted(
     OUT_SOURCE_PATH SOURCE_PATH
     PACKAGE_NAME    PyQt-builder
+    FILE_NAME       pyqt_builder
     VERSION         ${VERSION}
-    SHA512          ec0b9f7784a32af744111615b93f98d73f284bb752fd71359c798d3b093a01925823effea72c866a5f49f77e3dfc5dee4125bbb289f647d84000bf34b5db6931
+    SHA512          64fc969799a12a176eb730fdc4581f18293dceb8edff20db0177ce409fe7e712cdfb07449b6c4abdd33f1fd9aabe8bee248fe9aeb5373df533d805f9d2a0c6a5
     PATCHES
       libpath.patch
 )

diff --git a/ports/py-pyqt-builder/vcpkg.json b/ports/py-pyqt-builder/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "py-pyqt-builder",
-  "version": "1.15.4",
-  "port-version": 3,
+  "version": "1.16.2",
   "description": "PyQt-builder is the PEP 517 compliant build system for PyQt and projects that extend PyQt. It extends the SIP build system and uses Qt’s qmake to perform the actual compilation and installation of extension modules.",
   "homepage": "https://www.riverbankcomputing.com/software/pyqt-builder",
   "dependencies": [

diff --git a/ports/py-sip/portfile.cmake b/ports/py-sip/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_pythonhosted(
     OUT_SOURCE_PATH SOURCE_PATH
     PACKAGE_NAME    sip
     VERSION         ${VERSION}
-    SHA512          885c32a051e882b82b59bf1365050933f8fc1c619b19f4bc03235edc5741a5e14aae8edf90479ad0283f74ba5c5233a2589c151ec865b130199a6db9800a2294
+    SHA512          8a0ff1c16ead4c2b1c53963a015fb3d149362f649eeec2523e6b243945493f28f5ecf29aabbf5cee5f7909ded40d64a1f469d2d0c1b3c33244e6213ab23ec733
 )
 
 vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x)

diff --git a/ports/py-sip/vcpkg.json b/ports/py-sip/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "py-sip",
-  "version": "6.7.12",
-  "port-version": 3,
+  "version": "6.8.3",
   "description": "A tool that makes it easy to create Python bindings for C and C++ libraries",
   "homepage": "https://www.riverbankcomputing.com/software/sip",
   "dependencies": [

diff --git a/ports/vcpkg-python-scripts/vcpkg.json b/ports/vcpkg-python-scripts/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "vcpkg-python-scripts",
-  "version-date": "2023-06-28",
-  "port-version": 2,
+  "version-date": "2024-05-12",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "supports": "native",

diff --git a/ports/vcpkg-python-scripts/vcpkg_python_functions.cmake b/ports/vcpkg-python-scripts/vcpkg_python_functions.cmake
@@ -5,7 +5,7 @@ function(vcpkg_from_pythonhosted)
     PARSE_ARGV 0
     "arg"
     ""
-    "OUT_SOURCE_PATH;PACKAGE_NAME;VERSION;SHA512"
+    "OUT_SOURCE_PATH;PACKAGE_NAME;FILE_NAME;VERSION;SHA512"
     "PATCHES")
 
   if(DEFINED arg_UNPARSED_ARGUMENTS)
@@ -21,10 +21,13 @@ function(vcpkg_from_pythonhosted)
   if(NOT DEFINED arg_VERSION)
     message(FATAL_ERROR "VERSION must be specified.")
   endif()
+  if(NOT DEFINED arg_FILE_NAME)
+    set(arg_FILE_NAME ${arg_PACKAGE_NAME})
+  endif()
 
   string(SUBSTRING "${arg_PACKAGE_NAME}" 0 1 _PACKAGE_PREFIX)
   vcpkg_download_distfile(ARCHIVE
-    URLS "https://files.pythonhosted.org/packages/source/${_PACKAGE_PREFIX}/${arg_PACKAGE_NAME}/${arg_PACKAGE_NAME}-${arg_VERSION}.tar.gz"
+    URLS "https://files.pythonhosted.org/packages/source/${_PACKAGE_PREFIX}/${arg_PACKAGE_NAME}/${arg_FILE_NAME}-${arg_VERSION}.tar.gz"
     FILENAME "${arg_PACKAGE_NAME}-${arg_VERSION}.tar.gz"
     SHA512 ${arg_SHA512}
   )