PyQt-builder 1.17.0__tar.gz → 1.17.2__tar.gz

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyQt-builder
-Version: 1.17.0
+Version: 1.17.2
 Summary: The PyQt build system
 Author-email: Phil Thompson <phil@riverbankcomputing.com>
 License: Copyright 2024 Phil Thompson <phil@riverbankcomputing.com>

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/PyQt_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyQt-builder
-Version: 1.17.0
+Version: 1.17.2
 Summary: The PyQt build system
 Author-email: Phil Thompson <phil@riverbankcomputing.com>
 License: Copyright 2024 Phil Thompson <phil@riverbankcomputing.com>

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/PyQt_builder.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ pyqtbuild/bundle/packages/pyqtdatavisualization.py
 pyqtbuild/bundle/packages/pyqtnetworkauth.py
 pyqtbuild/bundle/packages/pyqtpurchasing.py
 pyqtbuild/bundle/packages/pyqtwebengine.py
-pyqtbuild/bundle/qt_wheel_distinfo/LICENSE
+pyqtbuild/bundle/qt_wheel_distinfo/LICENSE.gpl3
+pyqtbuild/bundle/qt_wheel_distinfo/LICENSE.lgpl3
 pyqtbuild/bundle/qt_wheel_distinfo/METADATA
 pyqtbuild/bundle/qt_wheel_distinfo/WHEEL

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/pyqtbuild/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.0'
-__version_tuple__ = version_tuple = (1, 17, 0)
+__version__ = version = '1.17.2'
+__version_tuple__ = version_tuple = (1, 17, 2)

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/pyqtbuild/builder.py

@@ -97,20 +97,17 @@ class QmakeBuilder(Builder):
             # Set the default minimum GLIBC version.  This is actually a
             # function of the build platform and it should really be determined
             # by inspecting the compiled extension module.  These defaults
-            # reflect the minimum versions required by the Qt online installer
-            # for a particular version.
+            # reflect the oldest version used by any of the supported Qt
+            # platforms (which may change over time).
             if not project.minimum_glibc_version:
-                if self.qt_version >= 0x060800:
+                if self.qt_version >= 0x060000:
                     from platform import processor
 
-                    # The arm64 build is based on Ubuntu 24.04 rather than
-                    # 22.04.
+                    # The arm64 build is based on Ubuntu 24.04 specifically.
                     if processor() == 'aarch64':
                         project.minimum_glibc_version = '2.39'
                     else:
-                        project.minimum_glibc_version = '2.35'
-                elif self.qt_version >= 0x060000:
-                    project.minimum_glibc_version = '2.28'
+                        project.minimum_glibc_version = '2.28'
                 else:
                     project.minimum_glibc_version = '2.17'
 
@@ -133,15 +130,15 @@ class QmakeBuilder(Builder):
             if not project.sip_module:
                 project.sip_module = 'PyQt{}.sip'.format(self.qt_version >> 16)
 
-            # Set the default ABI version of the sip module.
+            # Set the default ABI major version of the sip module.  These
+            # should track the versions specified by the latest versions of
+            # PyQt5 and PyQt6 (and vice versa).  This can be removed completely
+            # when PyQt5 and PyQt6 use %MinimumABIVersion unconditionaly.
             if not project.abi_version:
-                # These are the minimum recommended versions.  They correspond
-                # to the most up to date code that the current version of SIP
-                # will generate.
                 if project.sip_module == 'PyQt5.sip':
-                    project.abi_version = '12.13'
+                    project.abi_version = '12.15'
                 elif project.sip_module == 'PyQt6.sip':
-                    project.abi_version = '13.6'
+                    project.abi_version = '13.8'
 
         super().apply_user_defaults(tool)
 

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/pyqtbuild/bundle/packages/pyqt6.py

@@ -69,6 +69,15 @@ _QT_METADATA = {
         VersionedMetadata(version=(6, 8, 0),
                 lib_deps={'': ('QtMultimediaQuick', )},
                 other_lib_deps={
+                    'linux': (
+                            'libQt6FFmpegStub-crypto.so.3',
+                            'libQt6FFmpegStub-ssl.so.3',
+                            'libQt6FFmpegStub-va.so.2',
+                            'libQt6FFmpegStub-va-drm.so.2',
+                            'libQt6FFmpegStub-va-x11.so.2',
+                            'libavcodec.so.61', 'libavformat.so.61',
+                            'libavutil.so.59', 'libswresample.so.5',
+                            'libswscale.so.8'),
                     'macos': ('libavcodec.61.dylib', 'libavformat.61.dylib',
                             'libavutil.59.dylib', 'libswresample.5.dylib',
                             'libswscale.8.dylib'),

{pyqt_builder-1.17.0 → pyqt_builder-1.17.2}/pyqtbuild/bundle/qt_wheel.py

@@ -40,18 +40,21 @@ def qt_wheel(package, qt_dir, build_tag, suffix, msvc_runtime, openssl,
     # Construct the tag.
     qt_arch = os.path.basename(qt_dir)
 
-    if qt_arch in ('gcc_64', 'gcc_arm64'):
-        if package.qt_version >= (6, 8, 0):
-            manylinux = '_2_35' if qt_arch == 'gcc_64' else '_2_39'
-        elif package.qt_version >= (6, 0, 0):
-            manylinux = '_2_28'
+    if qt_arch.startswith('gcc_'):
+        if qt_arch == 'gcc_arm64':
+            wheel_arch = 'aarch64'
+            manylinux = '_2_39'
         else:
-            manylinux = '2014'
+            wheel_arch = 'x86_64'
+
+            if package.qt_version >= (6, 0, 0):
+                manylinux = '_2_28'
+            else:
+                manylinux = '2014'
 
-        wheel_arch = 'x86_64' if qt_arch == 'gcc_64' else 'aarch64'
         platform_tag = f'manylinux{manylinux}_{wheel_arch}'
 
-    elif qt_arch in ('macos', 'clang_64'):
+    elif qt_arch in ('macos', 'clang_64', 'x86_64', 'arm64'):
         if package.qt_version < (5, 15, 10) or (6, 0, 0) <= package.qt_version < (6, 2, 0):
             if arch is not None:
                 raise UserException(
@@ -59,7 +62,9 @@ def qt_wheel(package, qt_dir, build_tag, suffix, msvc_runtime, openssl,
 
             subarch = 'x86_64'
         elif arch is None:
-            subarch = 'universal2'
+            # Assume it is universal unless the installed Qt architecture is
+            # specific.
+            subarch = qt_arch if qt_arch in ('x86_64', 'arm64') else 'universal2'
         else:
             subarch = arch
 
@@ -170,6 +175,9 @@ def qt_wheel(package, qt_dir, build_tag, suffix, msvc_runtime, openssl,
 
                 if build_tag:
                     d.write('Build: {}\n'.format(build_tag))
+        elif proto.startswith('LICENSE.'):
+            if proto.endswith('.lgpl3' if lgpl else '.gpl3'):
+                shutil.copy(src, os.path.join(distinfo_dir, 'LICENSE'))
         else:
             shutil.copy(src, dst)
 

pyqt_builder-1.17.0/pyqtbuild/bundle/qt_wheel_distinfo/LICENSE → pyqt_builder-1.17.2/pyqtbuild/bundle/qt_wheel_distinfo/LICENSE.gpl3

@@ -1,28 +1,3 @@
-GENERAL
--------
-
-Qt is available under a commercial license with various pricing models and packages that meet a variety of needs. Commercial Qt license keeps your code proprietary where only you can control and monetize on your end product’s development, user experience and distribution. You also get great perks like additional functionality, productivity enhancing tools, world-class support and a close strategic relationship with The Qt Company to make sure your product and development goals are met.
-
-Qt has been created under the belief of open development and providing freedom and choice to developers. To support that, The Qt Company also licenses Qt under open source licenses, where most of the functionality is available under LGPLv3. It should be noted that the tools as well as some add-on components are available only under GPLv3. In order to preserve the true meaning of open development and uphold the spirit of free software, it is imperative that the rules and regulations of open source licenses are followed. If you use Qt under open-source licenses, you need to make sure that you comply with all the licenses of the components you use.
-
-Qt also contains some 3rd party components that are available under different open-source licenses. Please refer to the documentation for more details on 3rd party licenses used in Qt.
-
-
-GPLv3 and LGPLv3
-----------------
-
-            GNU LESSER GENERAL PUBLIC LICENSE
-
- The Qt Toolkit is Copyright (C) 2017 The Qt Company Ltd.
- Contact: https://www.qt.io/licensing
-
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
- GNU Lesser General Public License version 3, which supplements GNU General
- Public License Version 3. Both of the licenses are displayed below.
-
--------------------------------------------------------------------------
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -697,170 +672,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-
--------------------------------------------------------------------------
-
-            GNU LESSER GENERAL PUBLIC LICENSE
-                Version 3, 29 June 2007
-
- Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies of this
- license document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-0. Additional Definitions.
-
- As used herein, “this License” refers to version 3 of the GNU Lesser
-General Public License, and the “GNU GPL” refers to version 3 of the
-GNU General Public License.
-
- “The Library” refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An “Application” is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A “Combined Work” is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the “Linked
-Version”.
-
- The “Minimal Corresponding Source” for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The “Corresponding Application Code” for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-    a) under this License, provided that you make a good faith effort
-    to ensure that, in the event an Application does not supply the
-    function or data, the facility still operates, and performs
-    whatever part of its purpose remains meaningful, or
-
-    b) under the GNU GPL, with none of the additional permissions of
-    this License applicable to that copy.
-
-3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-    a) Give prominent notice with each copy of the object code that
-    the Library is used in it and that the Library and its use are
-    covered by this License.
-
-    b) Accompany the object code with a copy of the GNU GPL and this
-    license document.
-
-4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that, taken
-together, effectively do not restrict modification of the portions of
-the Library contained in the Combined Work and reverse engineering for
-debugging such modifications, if you also do each of the following:
-
-    a) Give prominent notice with each copy of the Combined Work that
-    the Library is used in it and that the Library and its use are
-    covered by this License.
-
-    b) Accompany the Combined Work with a copy of the GNU GPL and this
-    license document.
-
-    c) For a Combined Work that displays copyright notices during
-    execution, include the copyright notice for the Library among
-    these notices, as well as a reference directing the user to the
-    copies of the GNU GPL and this license document.
-
-    d) Do one of the following:
-
-        0) Convey the Minimal Corresponding Source under the terms of
-        this License, and the Corresponding Application Code in a form
-        suitable for, and under terms that permit, the user to
-        recombine or relink the Application with a modified version of
-        the Linked Version to produce a modified Combined Work, in the
-        manner specified by section 6 of the GNU GPL for conveying
-        Corresponding Source.
-
-        1) Use a suitable shared library mechanism for linking with
-        the Library. A suitable mechanism is one that (a) uses at run
-        time a copy of the Library already present on the user's
-        computer system, and (b) will operate properly with a modified
-        version of the Library that is interface-compatible with the
-        Linked Version.
-
-    e) Provide Installation Information, but only if you would
-    otherwise be required to provide such information under section 6
-    of the GNU GPL, and only to the extent that such information is
-    necessary to install and execute a modified version of the
-    Combined Work produced by recombining or relinking the Application
-    with a modified version of the Linked Version. (If you use option
-    4d0, the Installation Information must accompany the Minimal
-    Corresponding Source and Corresponding Application Code. If you
-    use option 4d1, you must provide the Installation Information in
-    the manner specified by section 6 of the GNU GPL for conveying
-    Corresponding Source.)
-
-5. Combined Libraries.
-
- You may place library facilities that are a work based on the Library
-side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities, conveyed under the terms of this License.
-
-    b) Give prominent notice with the combined library that part of
-    it is a work based on the Library, and explaining where to find
-    the accompanying uncombined form of the same work.
-
-6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-as you received it specifies that a certain numbered version of the
-GNU Lesser General Public License “or any later version” applies to
-it, you have the option of following the terms and conditions either
-of that published version or of any later version published by the
-Free Software Foundation. If the Library as you received it does not
-specify a version number of the GNU Lesser General Public License,
-you may choose any version of the GNU Lesser General Public License
-ever published by the Free Software Foundation.
-
-If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the Library.
-

pyqt_builder-1.17.2/pyqtbuild/bundle/qt_wheel_distinfo/LICENSE.lgpl3

@@ -0,0 +1,162 @@
+            GNU LESSER GENERAL PUBLIC LICENSE
+                Version 3, 29 June 2007
+
+ Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+0. Additional Definitions.
+
+ As used herein, “this License” refers to version 3 of the GNU Lesser
+General Public License, and the “GNU GPL” refers to version 3 of the
+GNU General Public License.
+
+ “The Library” refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An “Application” is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A “Combined Work” is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the “Linked
+Version”.
+
+ The “Minimal Corresponding Source” for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The “Corresponding Application Code” for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+    a) under this License, provided that you make a good faith effort
+    to ensure that, in the event an Application does not supply the
+    function or data, the facility still operates, and performs
+    whatever part of its purpose remains meaningful, or
+
+    b) under the GNU GPL, with none of the additional permissions of
+    this License applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+    a) Give prominent notice with each copy of the object code that
+    the Library is used in it and that the Library and its use are
+    covered by this License.
+
+    b) Accompany the object code with a copy of the GNU GPL and this
+    license document.
+
+4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that, taken
+together, effectively do not restrict modification of the portions of
+the Library contained in the Combined Work and reverse engineering for
+debugging such modifications, if you also do each of the following:
+
+    a) Give prominent notice with each copy of the Combined Work that
+    the Library is used in it and that the Library and its use are
+    covered by this License.
+
+    b) Accompany the Combined Work with a copy of the GNU GPL and this
+    license document.
+
+    c) For a Combined Work that displays copyright notices during
+    execution, include the copyright notice for the Library among
+    these notices, as well as a reference directing the user to the
+    copies of the GNU GPL and this license document.
+
+    d) Do one of the following:
+
+        0) Convey the Minimal Corresponding Source under the terms of
+        this License, and the Corresponding Application Code in a form
+        suitable for, and under terms that permit, the user to
+        recombine or relink the Application with a modified version of
+        the Linked Version to produce a modified Combined Work, in the
+        manner specified by section 6 of the GNU GPL for conveying
+        Corresponding Source.
+
+        1) Use a suitable shared library mechanism for linking with
+        the Library. A suitable mechanism is one that (a) uses at run
+        time a copy of the Library already present on the user's
+        computer system, and (b) will operate properly with a modified
+        version of the Library that is interface-compatible with the
+        Linked Version.
+
+    e) Provide Installation Information, but only if you would
+    otherwise be required to provide such information under section 6
+    of the GNU GPL, and only to the extent that such information is
+    necessary to install and execute a modified version of the
+    Combined Work produced by recombining or relinking the Application
+    with a modified version of the Linked Version. (If you use option
+    4d0, the Installation Information must accompany the Minimal
+    Corresponding Source and Corresponding Application Code. If you
+    use option 4d1, you must provide the Installation Information in
+    the manner specified by section 6 of the GNU GPL for conveying
+    Corresponding Source.)
+
+5. Combined Libraries.
+
+ You may place library facilities that are a work based on the Library
+side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities, conveyed under the terms of this License.
+
+    b) Give prominent notice with the combined library that part of
+    it is a work based on the Library, and explaining where to find
+    the accompanying uncombined form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+as you received it specifies that a certain numbered version of the
+GNU Lesser General Public License “or any later version” applies to
+it, you have the option of following the terms and conditions either
+of that published version or of any later version published by the
+Free Software Foundation. If the Library as you received it does not
+specify a version number of the GNU Lesser General Public License,
+you may choose any version of the GNU Lesser General Public License
+ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the Library.