View | Details | Raw Unified | Return to bug 239023 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/pyqt.mk (-3 / +3 lines)
Lines 64-72 MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ Link Here
64
			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
64
			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
65
			GENTOO
65
			GENTOO
66
66
67
SIP_VERSION=		4.19.17
67
SIP_VERSION=		4.19.18
68
QSCI2_VERSION=		2.11.1
68
QSCI2_VERSION=		2.11.2
69
PYQT5_VERSION=		5.12.2
69
PYQT5_VERSION=		5.13.0
70
70
71
SIP_DISTNAME=		sip-${SIP_VERSION}
71
SIP_DISTNAME=		sip-${SIP_VERSION}
72
PYQT5_DISTNAME=		PyQt5_gpl-${PYQT5_VERSION}
72
PYQT5_DISTNAME=		PyQt5_gpl-${PYQT5_VERSION}
(-)devel/py-qt5-core/files/patch-configure.py (-19 / +24 lines)
Lines 12-20 QtWebEngineWidgets. Link Here
12
12
13
Also causes .pyi files to be installed regardless of the Python version to
13
Also causes .pyi files to be installed regardless of the Python version to
14
simplify plist handling.
14
simplify plist handling.
15
--- configure.py.orig	2019-03-19 14:42:34 UTC
15
--- configure.py.orig	2019-07-04 16:44:01 UTC
16
+++ configure.py
16
+++ configure.py
17
@@ -521,7 +521,7 @@ class TargetConfiguration:
17
@@ -528,7 +528,7 @@ class TargetConfiguration:
18
         self.no_pydbus = False
18
         self.no_pydbus = False
19
         self.no_qml_plugin = False
19
         self.no_qml_plugin = False
20
         self.no_tools = False
20
         self.no_tools = False
Lines 32-38 simplify plist handling. Link Here
32
             self.prot_is_public = True
32
             self.prot_is_public = True
33
 
33
 
34
         self.vend_inc_dir = self.py_venv_inc_dir
34
         self.vend_inc_dir = self.py_venv_inc_dir
35
@@ -1492,8 +1492,9 @@ def generate_makefiles(target_config, verbose, parts, 
35
@@ -1494,8 +1494,9 @@ def generate_makefiles(target_config, verbose, parts, 
36
 
36
 
37
     # Add the internal modules if they are required.
37
     # Add the internal modules if they are required.
38
     if not target_config.no_tools:
38
     if not target_config.no_tools:
Lines 44-57 simplify plist handling. Link Here
44
 
44
 
45
     for mname in pyqt_modules:
45
     for mname in pyqt_modules:
46
         metadata = MODULE_METADATA[mname]
46
         metadata = MODULE_METADATA[mname]
47
@@ -1535,22 +1536,20 @@ def generate_makefiles(target_config, verbose, parts, 
47
@@ -1539,7 +1540,8 @@ def generate_makefiles(target_config, verbose, parts, 
48
 
48
 
49
     f.close()
49
     generate_sip_module_code(target_config, verbose, parts, tracing, 'Qt',
50
 
50
             fatal_warnings, sip_flags, False)
51
-    generate_sip_module_code(target_config, verbose, parts, tracing, 'Qt',
52
-            fatal_warnings, sip_flags, False)
53
-    subdirs.append('Qt')
51
-    subdirs.append('Qt')
54
-
52
+    if "QtCore" in target_config.pyqt_modules:
53
+        subdirs.append('Qt')
54
 
55
     # Generate the top-level __init__.py.
56
     inf = open(source_path('__init__.py'))
57
@@ -1583,16 +1585,18 @@ del find_qt
58
     # Generate any executable wrappers.
55
     wrappers = []
59
     wrappers = []
56
     if not target_config.no_tools:
60
     if not target_config.no_tools:
57
-        # Generate the pylupdate5 and pyrcc5 wrappers.
61
-        # Generate the pylupdate5 and pyrcc5 wrappers.
Lines 78-84 simplify plist handling. Link Here
78
 
82
 
79
     # Generate the Qt Designer plugin.
83
     # Generate the Qt Designer plugin.
80
     if not target_config.no_designer_plugin and 'QtDesigner' in target_config.pyqt_modules:
84
     if not target_config.no_designer_plugin and 'QtDesigner' in target_config.pyqt_modules:
81
@@ -1566,23 +1565,6 @@ def generate_makefiles(target_config, verbose, parts, 
85
@@ -1608,23 +1612,6 @@ del find_qt
82
                     source_path('examples', 'quick', 'tutorials', 'extending',
86
                     source_path('examples', 'quick', 'tutorials', 'extending',
83
                             'chapter6-plugins'))
87
                             'chapter6-plugins'))
84
 
88
 
Lines 102-108 simplify plist handling. Link Here
102
     # Generate the Python dbus module.
106
     # Generate the Python dbus module.
103
     if target_config.pydbus_module_dir != '':
107
     if target_config.pydbus_module_dir != '':
104
         mname = 'dbus'
108
         mname = 'dbus'
105
@@ -1613,27 +1595,31 @@ def generate_makefiles(target_config, verbose, parts, 
109
@@ -1655,27 +1642,31 @@ del find_qt
106
         all_installs.append(
110
         all_installs.append(
107
                 root_dir + '/' + module_file_name(target_config, mname))
111
                 root_dir + '/' + module_file_name(target_config, mname))
108
 
112
 
Lines 114-125 simplify plist handling. Link Here
114
 SUBDIRS = %s
118
 SUBDIRS = %s
115
+''' % (' '.join(subdirs)))
119
+''' % (' '.join(subdirs)))
116
 
120
 
121
-init_py.files = __init__.py
117
+    if "QtCore" in target_config.pyqt_modules:
122
+    if "QtCore" in target_config.pyqt_modules:
118
+        out_f.write('''
123
+        out_f.write('''
119
 init_py.files = %s
124
+init_py.files = %s
120
 init_py.path = %s
125
 init_py.path = %s
121
 INSTALLS += init_py
126
 INSTALLS += init_py
122
-''' % (' '.join(subdirs), source_path('__init__.py'), root_dir))
127
-''' % (' '.join(subdirs), root_dir))
123
+''' % (source_path('__init__.py'), root_dir))
128
+''' % (source_path('__init__.py'), root_dir))
124
 
129
 
125
-    all_installs.append(root_dir + '/__init__.py')
130
-    all_installs.append(root_dir + '/__init__.py')
Lines 140-146 simplify plist handling. Link Here
140
 
145
 
141
     # Install the tool main scripts and wrappers.
146
     # Install the tool main scripts and wrappers.
142
     if wrappers:
147
     if wrappers:
143
@@ -1662,6 +1648,8 @@ INSTALLS += tools
148
@@ -1704,6 +1695,8 @@ INSTALLS += tools
144
     # Install the .sip files.
149
     # Install the .sip files.
145
     if target_config.pyqt_sip_dir:
150
     if target_config.pyqt_sip_dir:
146
         for mname, metadata in MODULE_METADATA.items():
151
         for mname, metadata in MODULE_METADATA.items():
Lines 149-155 simplify plist handling. Link Here
149
             if metadata.public and mname != 'Qt':
154
             if metadata.public and mname != 'Qt':
150
                 sip_files = matching_files(source_path('sip', mname, '*.sip'))
155
                 sip_files = matching_files(source_path('sip', mname, '*.sip'))
151
 
156
 
152
@@ -1681,7 +1669,7 @@ INSTALLS += sip%s
157
@@ -1723,7 +1716,7 @@ INSTALLS += sip%s
153
                     all_installs.append(mdir)
158
                     all_installs.append(mdir)
154
 
159
 
155
     # Install the stub files.
160
     # Install the stub files.
Lines 158-164 simplify plist handling. Link Here
158
         pyi_names = [mname + '.pyi'
163
         pyi_names = [mname + '.pyi'
159
                 for mname in target_config.pyqt_modules if mname[0] != '_']
164
                 for mname in target_config.pyqt_modules if mname[0] != '_']
160
 
165
 
161
@@ -1699,14 +1687,15 @@ INSTALLS += pep484_stubs
166
@@ -1741,14 +1734,15 @@ INSTALLS += pep484_stubs
162
     # Install the QScintilla .api file.
167
     # Install the QScintilla .api file.
163
     if target_config.qsci_api:
168
     if target_config.qsci_api:
164
         api_dir = target_config.qsci_api_dir + '/api/python'
169
         api_dir = target_config.qsci_api_dir + '/api/python'
Lines 177-183 simplify plist handling. Link Here
177
 
182
 
178
     if distinfo:
183
     if distinfo:
179
         # The command to run to generate the .dist-info directory.
184
         # The command to run to generate the .dist-info directory.
180
@@ -1970,7 +1959,7 @@ def inform_user(target_config, sip_version):
185
@@ -2012,7 +2006,7 @@ def inform_user(target_config, sip_version):
181
                         os.path.join(
186
                         os.path.join(
182
                                 target_config.qsci_api_dir, 'api', 'python'))
187
                                 target_config.qsci_api_dir, 'api', 'python'))
183
 
188
 
Lines 186-192 simplify plist handling. Link Here
186
         inform("The PyQt5 PEP 484 stub files will be installed in %s." %
191
         inform("The PyQt5 PEP 484 stub files will be installed in %s." %
187
                 target_config.pyqt_stubs_dir)
192
                 target_config.pyqt_stubs_dir)
188
 
193
 
189
@@ -2546,7 +2535,7 @@ def generate_sip_module_code(target_config, verbose, p
194
@@ -2589,7 +2583,7 @@ def generate_sip_module_code(target_config, verbose, p
190
             argv.append('-a')
195
             argv.append('-a')
191
             argv.append(mname + '.api')
196
             argv.append(mname + '.api')
192
 
197
 
Lines 195-201 simplify plist handling. Link Here
195
             argv.append('-y')
200
             argv.append('-y')
196
             argv.append(mname + '.pyi')
201
             argv.append(mname + '.pyi')
197
 
202
 
198
@@ -2719,7 +2708,7 @@ target.files = $$PY_MODULE
203
@@ -2762,7 +2756,7 @@ target.files = $$PY_MODULE
199
     pro_lines.append('INSTALLS += target')
204
     pro_lines.append('INSTALLS += target')
200
 
205
 
201
     # This optimisation could apply to other platforms.
206
     # This optimisation could apply to other platforms.
(-)devel/py-qt5-core/pkg-plist (+3 lines)
Lines 2-7 bin/pyuic5 Link Here
2
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.py
2
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.py
3
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyc
3
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyc
4
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyo
4
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyo
5
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.so
5
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
6
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
6
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.so
7
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.so
7
%%PYTHON_SITELIBDIR%%/PyQt5/__init__.py
8
%%PYTHON_SITELIBDIR%%/PyQt5/__init__.py
Lines 118-123 bin/pyuic5 Link Here
118
%%PYQT_SIPDIR%%/QtCore/qcollator.sip
119
%%PYQT_SIPDIR%%/QtCore/qcollator.sip
119
%%PYQT_SIPDIR%%/QtCore/qcommandlineoption.sip
120
%%PYQT_SIPDIR%%/QtCore/qcommandlineoption.sip
120
%%PYQT_SIPDIR%%/QtCore/qcommandlineparser.sip
121
%%PYQT_SIPDIR%%/QtCore/qcommandlineparser.sip
122
%%PYQT_SIPDIR%%/QtCore/qconcatenatetablesproxymodel.sip
121
%%PYQT_SIPDIR%%/QtCore/qcoreapplication.sip
123
%%PYQT_SIPDIR%%/QtCore/qcoreapplication.sip
122
%%PYQT_SIPDIR%%/QtCore/qcoreevent.sip
124
%%PYQT_SIPDIR%%/QtCore/qcoreevent.sip
123
%%PYQT_SIPDIR%%/QtCore/qcryptographichash.sip
125
%%PYQT_SIPDIR%%/QtCore/qcryptographichash.sip
Lines 217-222 bin/pyuic5 Link Here
217
%%PYQT_SIPDIR%%/QtCore/qtimer.sip
219
%%PYQT_SIPDIR%%/QtCore/qtimer.sip
218
%%PYQT_SIPDIR%%/QtCore/qtimezone.sip
220
%%PYQT_SIPDIR%%/QtCore/qtimezone.sip
219
%%PYQT_SIPDIR%%/QtCore/qtranslator.sip
221
%%PYQT_SIPDIR%%/QtCore/qtranslator.sip
222
%%PYQT_SIPDIR%%/QtCore/qtransposeproxymodel.sip
220
%%PYQT_SIPDIR%%/QtCore/qurl.sip
223
%%PYQT_SIPDIR%%/QtCore/qurl.sip
221
%%PYQT_SIPDIR%%/QtCore/qurlquery.sip
224
%%PYQT_SIPDIR%%/QtCore/qurlquery.sip
222
%%PYQT_SIPDIR%%/QtCore/quuid.sip
225
%%PYQT_SIPDIR%%/QtCore/quuid.sip
(-)devel/py-qt5-help/pkg-plist (+3 lines)
Lines 1-9 Link Here
1
%%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.so
1
%%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.so
2
%%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.pyi
2
%%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.pyi
3
%%PYQT_SIPDIR%%/QtHelp/QtHelpmod.sip
3
%%PYQT_SIPDIR%%/QtHelp/QtHelpmod.sip
4
%%PYQT_SIPDIR%%/QtHelp/qcompressedhelpinfo.sip
4
%%PYQT_SIPDIR%%/QtHelp/qhelpcontentwidget.sip
5
%%PYQT_SIPDIR%%/QtHelp/qhelpcontentwidget.sip
5
%%PYQT_SIPDIR%%/QtHelp/qhelpengine.sip
6
%%PYQT_SIPDIR%%/QtHelp/qhelpengine.sip
6
%%PYQT_SIPDIR%%/QtHelp/qhelpenginecore.sip
7
%%PYQT_SIPDIR%%/QtHelp/qhelpenginecore.sip
8
%%PYQT_SIPDIR%%/QtHelp/qhelpfilterdata.sip
9
%%PYQT_SIPDIR%%/QtHelp/qhelpfilterengine.sip
7
%%PYQT_SIPDIR%%/QtHelp/qhelpindexwidget.sip
10
%%PYQT_SIPDIR%%/QtHelp/qhelpindexwidget.sip
8
%%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip
11
%%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip
9
%%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip
12
%%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip
(-)devel/py-qt5/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1557776717
1
TIMESTAMP = 1562430455
2
SHA256 (PyQt5_gpl-5.12.2.tar.gz) = c565829e77dc9c281aa1a0cdf2eddaead4e0f844cbaf7a4408441967f03f5f0f
2
SHA256 (PyQt5_gpl-5.13.0.tar.gz) = 0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9
3
SIZE (PyQt5_gpl-5.12.2.tar.gz) = 3147205
3
SIZE (PyQt5_gpl-5.13.0.tar.gz) = 3152704
(-)devel/py-sip/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1557776829
1
TIMESTAMP = 1562430360
2
SHA256 (sip-4.19.17.tar.gz) = 12bcd8f4d5feefc105bc075d12c5090ee783f7380728563c91b8b95d0ec45df3
2
SHA256 (sip-4.19.18.tar.gz) = c0bd863800ed9b15dcad477c4017cdb73fa805c25908b0240564add74d697e1e
3
SIZE (sip-4.19.17.tar.gz) = 1056156
3
SIZE (sip-4.19.18.tar.gz) = 1056840
(-)devel/qscintilla2-qt5/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1553895280
1
TIMESTAMP = 1562430390
2
SHA256 (QScintilla_gpl-2.11.1.tar.gz) = dae54d19e43dba5a3f98ac084fc0bcfa6fb713fa851f1783a01404397fd722f5
2
SHA256 (QScintilla_gpl-2.11.2.tar.gz) = 029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
3
SIZE (QScintilla_gpl-2.11.1.tar.gz) = 2932060
3
SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
(-)devel/qscintilla2-qt5/pkg-plist (+1 lines)
Lines 67-72 Link Here
67
%%QT_DATADIR%%/qsci/api/python/Python-3.5.api
67
%%QT_DATADIR%%/qsci/api/python/Python-3.5.api
68
%%QT_DATADIR%%/qsci/api/python/Python-3.6.api
68
%%QT_DATADIR%%/qsci/api/python/Python-3.6.api
69
%%QT_DATADIR%%/qsci/api/python/Python-3.7.api
69
%%QT_DATADIR%%/qsci/api/python/Python-3.7.api
70
%%QT_DATADIR%%/qsci/api/python/Python-3.8.api
70
%%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm
71
%%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm
71
%%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm
72
%%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm
72
%%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm
73
%%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm
(-)net/py-qt5-network/pkg-plist (+1 lines)
Lines 23-28 Link Here
23
%%PYQT_SIPDIR%%/QtNetwork/qnetworkreply.sip
23
%%PYQT_SIPDIR%%/QtNetwork/qnetworkreply.sip
24
%%PYQT_SIPDIR%%/QtNetwork/qnetworkrequest.sip
24
%%PYQT_SIPDIR%%/QtNetwork/qnetworkrequest.sip
25
%%PYQT_SIPDIR%%/QtNetwork/qnetworksession.sip
25
%%PYQT_SIPDIR%%/QtNetwork/qnetworksession.sip
26
%%PYQT_SIPDIR%%/QtNetwork/qocspresponse.sip
26
%%PYQT_SIPDIR%%/QtNetwork/qpassworddigestor.sip
27
%%PYQT_SIPDIR%%/QtNetwork/qpassworddigestor.sip
27
%%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qhash.sip
28
%%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qhash.sip
28
%%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qmap.sip
29
%%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qmap.sip

Return to bug 239023