Skip to content

Commit 9e7e663

Browse files
m-kuhnm-kuhn
authored
Merge pull request #3 from open-vcpkg/fix-pyqt6
Test pyqt6
2 parents 50981d2 + 8a48ae5 commit 9e7e663

34 files changed

+307
-119
lines changed

‎.github/workflows/macos.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: 🔨 Prepare build env
4141
run: |
42-
brew install autoconf automake autoconf-archive
42+
brew install autoconf automake autoconf-archive libtool
4343
4444
- name: 🐕 Checkout vcpkg
4545
uses: actions/checkout@v4
@@ -59,6 +59,7 @@ jobs:
5959
mono $NUGET_EXE sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText
6060
mono $NUGET_EXE setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json"
6161
echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json,readwrite" >> $GITHUB_ENV
62+
VCPKG_ROOT=$(pwd)/vcpkg
6263
echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV
6364
echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
6465
@@ -67,7 +68,8 @@ jobs:
6768
VCPKG_OPTIONS="--overlay-ports="${{ github.workspace }}/ports" --host-triplet=${{ matrix.triplet }} --triplet=${{ matrix.triplet }} --x-buildtrees-root=${{ env.buildtrees }}"
6869
./vcpkg/vcpkg install $VCPKG_OPTIONS py-pip
6970
./vcpkg/vcpkg install $VCPKG_OPTIONS py-sip
70-
71+
# ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pyqt6
72+
7173
- name: 📑 Upload logs
7274
uses: actions/upload-artifact@v4
7375
if: failure()

‎.github/workflows/windows.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,18 @@ jobs:
5050
$NUGET_EXE sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText
5151
$NUGET_EXE setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json"
5252
echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json,readwrite" >> $GITHUB_ENV
53+
VCPKG_ROOT=$(cygpath -w $(pwd)/vcpkg)
5354
echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV
5455
echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
5556
57+
5658
- name: 🌋 Build
5759
run: |
58-
.\vcpkg\vcpkg.exe install --overlay-ports="${{ github.workspace }}/ports" --triplet=${{ matrix.triplet }} py-sip
59-
60+
.\vcpkg\vcpkg.exe install --overlay-ports="${{ github.workspace }}/ports" --triplet=${{ matrix.triplet }} --x-buildtrees-root=C:/vcpkg-build py-pyqt6
61+
6062
- name: 📑 Upload logs
6163
uses: actions/upload-artifact@v4
6264
if: failure()
6365
with:
6466
name: logs-${{ matrix.triplet }}
65-
path: /c/vcpkg/buildtrees/**/*.log
67+
path: C:/vcpkg-build/**/*.log

‎ports/py-packaging/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"homepage": "packaging.pypa.io/",
66
"license": "MIT",
77
"dependencies": [
8-
"python3",
98
"py-flit-core",
109
"py-gpep517",
10+
"python3",
1111
{
1212
"name": "vcpkg-python-scripts",
1313
"host": true

‎ports/py-pip/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"description": "Tool for installing and managing Python packages",
66
"homepage": "https://pypi.org/project/setuptools",
77
"dependencies": [
8-
"python3",
98
{
109
"name": "py-setuptools",
1110
"host": true
1211
},
12+
"python3",
1313
{
1414
"name": "vcpkg-python-scripts",
1515
"host": true

‎ports/py-ply/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"description": "Python Lex & Yacc",
66
"homepage": "https://www.dabeaz.com/ply/",
77
"dependencies": [
8-
"python3",
98
{
109
"name": "py-setuptools",
1110
"host": true
1211
},
12+
"python3",
1313
{
1414
"name": "vcpkg-python-scripts",
1515
"host": true

‎ports/py-pyparsing/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"homepage": "https://github.com/pyparsing/pyparsing",
77
"license": "MIT",
88
"dependencies": [
9-
"python3",
109
{
1110
"name": "py-setuptools",
1211
"host": true
1312
},
13+
"python3",
1414
{
1515
"name": "vcpkg-python-scripts",
1616
"host": true

‎ports/py-pyqt-builder/libpath.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/pyqtbuild/project.py b/pyqtbuild/project.py
2+
index 20ab60f..4f4d105 100644
3+
--- a/pyqtbuild/project.py
4+
+++ b/pyqtbuild/project.py
5+
@@ -73,7 +73,8 @@ class PyQtProject(Project):
6+
# these are actually non-user options but we need the 'link_full_dll'
7+
# user option in order to set them.
8+
if self.py_platform == 'win32':
9+
- pylib_dir = os.path.join(sys.base_prefix, 'libs')
10+
+ # vcpkg install python3.lib into [installed]/lib
11+
+ pylib_dir = os.path.join(sys.base_prefix, '..', '..', 'lib')
12+
13+
debug_suffix = '_d' if self.py_debug else ''
14+

‎ports/py-pyqt-builder/portfile.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ vcpkg_from_pythonhosted(
33
PACKAGE_NAME PyQt-builder
44
VERSION ${VERSION}
55
SHA512 ec0b9f7784a32af744111615b93f98d73f284bb752fd71359c798d3b093a01925823effea72c866a5f49f77e3dfc5dee4125bbb289f647d84000bf34b5db6931
6+
PATCHES
7+
libpath.patch
68
)
79

810
vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x)

‎ports/py-pyqt-builder/vcpkg.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "py-pyqt-builder",
33
"version": "1.15.4",
4-
"port-version": 2,
4+
"port-version": 3,
55
"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.",
66
"homepage": "https://www.riverbankcomputing.com/software/pyqt-builder",
77
"dependencies": [
8-
"python3",
98
{
109
"name": "py-setuptools",
1110
"host": true
1211
},
12+
"python3",
1313
{
1414
"name": "vcpkg-python-scripts",
1515
"host": true

‎ports/py-pyqt6-sip/portfile.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
2+
3+
vcpkg_from_pythonhosted(
4+
OUT_SOURCE_PATH SOURCE_PATH
5+
PACKAGE_NAME PyQt6_sip
6+
VERSION ${VERSION}
7+
SHA512 bd2fa70d64544d8104d3477cb650a0e6bcefa0008680afcf7d187ba3fb1117871c0237d3a7f047144c8a8a8eeb8da941a3b206f8ee0601cb2cc734243cdb9d46
8+
)
9+
10+
vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
11+
12+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
13+
14+
vcpkg_python_test_import(MODULE "PyQt6.sip")
15+
16+
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

0 commit comments

Comments
 (0)