PySide6-QtAds 4.4.1__tar.gz → 4.4.1.1__tar.gz

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/CMakeLists.txt

@@ -104,17 +104,30 @@ macro(pyside_config option output_var)
     endif()
 endmacro()
 
-# Query for the shiboken generator path, Python path, include paths and linker flags.
+# Query for the shiboken6-generator path, PySide6 path, Python path, include paths and linker flags.
 pyside_config(--shiboken-module-path shiboken_module_path)
 pyside_config(--shiboken-generator-path shiboken_generator_path)
 pyside_config(--pyside-path pyside_path)
-pyside_config(--pyside-include-path pyside_include_dir 1)
+
 pyside_config(--python-include-path python_include_dir)
-pyside_config(--shiboken-generator-include-path shiboken_include_dir 1)
-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0)
+pyside_config(--shiboken-include-path shiboken_include_dir 1)
+pyside_config(--pyside-include-path pyside_include_dir 1)
+
 pyside_config(--python-link-flags-cmake python_linking_data 0)
+pyside_config(--shiboken-module-shared-libraries-cmake shiboken_module_shared_libraries 0)
 pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0)
 
+# Print the computed variables
+message(STATUS "Shiboken module path: ${shiboken_module_path}")
+message(STATUS "Shiboken generator path: ${shiboken_generator_path}")
+message(STATUS "PySide path: ${pyside_path}")
+message(STATUS "Python include path: ${python_include_dir}")
+message(STATUS "Shiboken include path: ${shiboken_include_dir}")
+message(STATUS "PySide include path: ${pyside_include_dir}")
+message(STATUS "Python linking data: ${python_linking_data}")
+message(STATUS "Shiboken module shared libraries: ${shiboken_module_shared_libraries}")
+message(STATUS "PySide shared libraries: ${pyside_shared_libraries}")
+
 set(shiboken_path "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 if(NOT EXISTS ${shiboken_path})
     message(FATAL_ERROR "Shiboken executable not found at path: ${shiboken_path}")
@@ -233,7 +246,7 @@ target_include_directories(${bindings_library} PRIVATE "${CMAKE_SOURCE_DIR}/src"
 target_link_libraries(${bindings_library} PRIVATE Qt6::Widgets)
 target_link_libraries(${bindings_library} PRIVATE ${project_library})
 target_link_libraries(${bindings_library} PRIVATE ${pyside_shared_libraries})
-target_link_libraries(${bindings_library} PRIVATE ${shiboken_shared_libraries})
+target_link_libraries(${bindings_library} PRIVATE ${shiboken_module_shared_libraries})
 
 target_compile_options(qtadvanceddocking-qt6 PRIVATE -Og -fPIC)
 target_compile_options(${bindings_library} PRIVATE -Og -fPIC)

{pyside6_qtads-4.4.1/src/PySide6_QtAds.egg-info → pyside6_qtads-4.4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySide6-QtAds
-Version: 4.4.1
+Version: 4.4.1.1
 Summary: PySide6 bindings to Qt Advanced Docking System
 License: PySide6-QtAds is licensed under GNU LGPL v2.1.
         
@@ -59,11 +59,11 @@ You may also build from source. Example build from source on Ubuntu 24.04:
 ```bash
 # Install Qt (for example, using aqtinstall)
 pip install aqtinstall
-aqt install-qt linux desktop 6.9.2 --outputdir qt
+aqt install-qt linux desktop 6.10.0 --outputdir qt
 
 # Build PySide6-QtAds
-LD_LIBRARY_PATH=$PWD/qt/6.9.2/gcc_64/lib \
-CMAKE_PREFIX_PATH=$PWD/qt/6.9.2/gcc_64/lib/cmake/ \
+LD_LIBRARY_PATH=$PWD/qt/6.10.0/gcc_64/lib \
+CMAKE_PREFIX_PATH=$PWD/qt/6.10.0/gcc_64/lib/cmake/ \
 PIP_EXTRA_INDEX_URL=https://download.qt.io/official_releases/QtForPython/ \
 pip install -v .
 ```

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/Qt-Advanced-Docking-System/src/CMakeLists.txt

@@ -92,7 +92,7 @@ target_link_libraries(${library_name} PUBLIC Qt${QT_VERSION_MAJOR}::Core
                                                Qt${QT_VERSION_MAJOR}::Gui 
                                                Qt${QT_VERSION_MAJOR}::Widgets)
 
-if(QT_VERSION_MAJOR STREQUAL "6")
+if(UNIX AND NOT APPLE AND QT_VERSION_MAJOR STREQUAL "6")
     target_link_libraries(${library_name} PRIVATE Qt6::GuiPrivate) #needed for <qpa/qplatformnativeinterface.h>
 endif()
 

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/README.md

@@ -15,11 +15,11 @@ You may also build from source. Example build from source on Ubuntu 24.04:
 ```bash
 # Install Qt (for example, using aqtinstall)
 pip install aqtinstall
-aqt install-qt linux desktop 6.9.2 --outputdir qt
+aqt install-qt linux desktop 6.10.0 --outputdir qt
 
 # Build PySide6-QtAds
-LD_LIBRARY_PATH=$PWD/qt/6.9.2/gcc_64/lib \
-CMAKE_PREFIX_PATH=$PWD/qt/6.9.2/gcc_64/lib/cmake/ \
+LD_LIBRARY_PATH=$PWD/qt/6.10.0/gcc_64/lib \
+CMAKE_PREFIX_PATH=$PWD/qt/6.10.0/gcc_64/lib/cmake/ \
 PIP_EXTRA_INDEX_URL=https://download.qt.io/official_releases/QtForPython/ \
 pip install -v .
 ```

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PySide6-QtAds"
-version = "4.4.1"
+version = "4.4.1.1"
 description = "PySide6 bindings to Qt Advanced Docking System"
 license = { file = "LICENSE.txt" }
 readme = { file = "README.md", content-type = "text/markdown" }

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/scripts/custom-auditwheel.py

@@ -13,6 +13,7 @@ if __name__ == "__main__":
         policies = json.loads(POLICY_JSON_MAP[libc].read_text())
         for p in policies:
             p['lib_whitelist'].extend([
+                'libpyside6.abi3.so.6.10',
                 'libpyside6.abi3.so.6.9',
                 'libpyside6.abi3.so.6.8',
                 'libpyside6.abi3.so.6.7',
@@ -20,6 +21,7 @@ if __name__ == "__main__":
                 'libpyside6.abi3.so.6.5',
                 'libpyside6.abi3.so.6.4',
                 'libpyside6.abi3.so.6.3',
+                'libshiboken6.abi3.so.6.10',
                 'libshiboken6.abi3.so.6.9',
                 'libshiboken6.abi3.so.6.8',
                 'libshiboken6.abi3.so.6.7',
@@ -29,6 +31,7 @@ if __name__ == "__main__":
                 'libshiboken6.abi3.so.6.3',
                 'libQt6Widgets.so.6',
                 'libQt6Gui.so.6',
+                'libpyside6qml.abi3.so.6.10',
                 'libpyside6qml.abi3.so.6.9',
                 'libpyside6qml.abi3.so.6.8',
                 'libpyside6qml.abi3.so.6.7',

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/scripts/pyside_config.py

@@ -1,5 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+from __future__ import annotations
 
 import sysconfig
 from enum import Enum
@@ -48,10 +49,10 @@ options.append(("--python-include-path",
                 lambda: get_python_include_path(),
                 python_include_error,
                 "Print Python include path"))
-options.append(("--shiboken-generator-include-path",
-                lambda: get_package_include_path(Package.SHIBOKEN_GENERATOR),
+options.append(("--shiboken-include-path",
+                lambda: get_package_include_path(Package.SHIBOKEN_MODULE),
                 pyside_error,
-                "Print shiboken generator include paths"))
+                "Print shiboken module include paths"))
 options.append(("--pyside-include-path",
                 lambda: get_package_include_path(Package.PYSIDE_MODULE),
                 pyside_error,
@@ -78,10 +79,12 @@ options.append(("--shiboken-module-shared-libraries-cmake",
 
 options.append(("--pyside-shared-libraries-qmake",
                 lambda: get_shared_libraries_qmake(Package.PYSIDE_MODULE), pyside_libs_error,
-                "Print paths of f{PYSIDE_MODULE} shared libraries (.so's, .dylib's, .dll's) for qmake"))
+                "Print paths of f{PYSIDE_MODULE} shared libraries (.so's, .dylib's, .dll's) "
+                "for qmake"))
 options.append(("--pyside-shared-libraries-cmake",
                 lambda: get_shared_libraries_cmake(Package.PYSIDE_MODULE), pyside_libs_error,
-                f"Print paths of {PYSIDE_MODULE} shared libraries (.so's, .dylib's, .dll's) for cmake"))
+                f"Print paths of {PYSIDE_MODULE} shared libraries (.so's, .dylib's, .dll's) "
+                "for cmake"))
 
 options_usage = ''
 for i, (flag, _, _, description) in enumerate(options):
@@ -153,11 +156,11 @@ def link_option(lib):
     # libraries when compiling the project
     baseName = os.path.basename(lib)
     link = ' -l'
-    if sys.platform in ['linux', 'linux2']: # Linux: 'libfoo.so' -> '/absolute/path/libfoo.so'
+    if sys.platform in ['linux', 'linux2']:  # Linux: 'libfoo.so' -> '/absolute/path/libfoo.so'
         link = lib
-    elif sys.platform in ['darwin']: # Darwin: 'libfoo.so' -> '-lfoo'
+    elif sys.platform in ['darwin']:  # Darwin: 'libfoo.so' -> '-lfoo'
         link += os.path.splitext(baseName[3:])[0]
-    else: # Windows: 'libfoo.dll' -> 'libfoo.dll'
+    else:  # Windows: 'libfoo.dll' -> 'libfoo.dll'
         link += os.path.splitext(baseName)[0]
     return link
 
@@ -194,13 +197,16 @@ def find_package_path(dir_name):
     return None
 
 
-# Return version as "3.6"
+# Return version as "x.y" (e.g. 3.9, 3.12, etc)
 def python_version():
     return str(sys.version_info[0]) + '.' + str(sys.version_info[1])
 
 
 def get_python_include_path():
-    return sysconfig.get_path('include')
+    if sys.platform == 'win32':
+        return sysconfig.get_path('include')
+    else:
+        return sysconfig.get_path('include', scheme="posix_prefix")
 
 
 def python_link_flags_qmake():
@@ -212,7 +218,7 @@ def python_link_flags_qmake():
         # e.g.: "Program Files" to "Progra~1"
         for d in libdir.split("\\"):
             if " " in d:
-                libdir = libdir.replace(d, d.split(" ")[0][:-1]+"~1")
+                libdir = libdir.replace(d, d.split(" ")[0][:-1] + "~1")
         lib_flags = flags['lib']
         return f'-L{libdir} -l{lib_flags}'
     elif sys.platform == 'darwin':

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1/src/PySide6_QtAds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySide6-QtAds
-Version: 4.4.1
+Version: 4.4.1.1
 Summary: PySide6 bindings to Qt Advanced Docking System
 License: PySide6-QtAds is licensed under GNU LGPL v2.1.
         
@@ -59,11 +59,11 @@ You may also build from source. Example build from source on Ubuntu 24.04:
 ```bash
 # Install Qt (for example, using aqtinstall)
 pip install aqtinstall
-aqt install-qt linux desktop 6.9.2 --outputdir qt
+aqt install-qt linux desktop 6.10.0 --outputdir qt
 
 # Build PySide6-QtAds
-LD_LIBRARY_PATH=$PWD/qt/6.9.2/gcc_64/lib \
-CMAKE_PREFIX_PATH=$PWD/qt/6.9.2/gcc_64/lib/cmake/ \
+LD_LIBRARY_PATH=$PWD/qt/6.10.0/gcc_64/lib \
+CMAKE_PREFIX_PATH=$PWD/qt/6.10.0/gcc_64/lib/cmake/ \
 PIP_EXTRA_INDEX_URL=https://download.qt.io/official_releases/QtForPython/ \
 pip install -v .
 ```

{pyside6_qtads-4.4.1 → pyside6_qtads-4.4.1.1}/src/PySide6_QtAds.egg-info/SOURCES.txt

@@ -368,7 +368,6 @@ Qt-Advanced-Docking-System/src/stylesheets/default_linux.css
 Qt-Advanced-Docking-System/src/stylesheets/focus_highlighting.css
 Qt-Advanced-Docking-System/src/stylesheets/focus_highlighting_linux.css
 scripts/custom-auditwheel.py
-scripts/get-recent-releases.py
 scripts/pyside_config.py
 scripts/set-qt-constraint.py
 src/bindings.h

pyside6_qtads-4.4.1/scripts/get-recent-releases.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-import requests
-import argparse
-
-def main():
-	ap = argparse.ArgumentParser()
-	ap.add_argument('num', type=int)
-	args = ap.parse_args()
-
-	endpoint = 'https://pypi.org/pypi/PySide6/json'
-	all_releases = list(requests.get(endpoint).json()['releases'].keys())
-	for i, ver in enumerate(all_releases[0-args.num:]):
-		print(f'rel{args.num-i-1}={ver}')
-
-
-if __name__ == '__main__':
-	main()