PyQt in core-updates

[Andreas Enge <andreas@enge.fr>]

[-- Attachment #1: Type: text/plain, Size: 1747 bytes --]

Hello,

the attached patch seems to be necessary to start configuring python-pyqt
in core-updates.

But then the configure step still fails. The error message of "guix build"
is not helpful, but running the configure step in the result of "guix build -K"
shows the following:
...
The interpreter used by pyuic5 is
/gnu/store/82nin1sk01l31p5vpnz9c2ki76qka9b0-python-wrapper-3.10.7/bin/python.
Generating the C++ source for the QtCore module...
Error: Unable to create the C++ code.

A search seems to indicate that sip does not do its job, but the exact same
error with this PyQt version does not show up.

The error message comes from the function
def generate_sip_module_code
in configure.py, which creates a command that is run with run_command.
Precisely, the command is
/gnu/store/zd8nrmc0207l90vscnf7dlswd6z16aas-python-sip-5.5.0/bin/sip5 -w -n PyQt5.sip -t WS_X11 -t Qt_5_15_0 -f -P -o -y QtCore.pyi -c /tmp/guix-build-python-pyqt-5.15.8.drv-2/PyQt5-5.15.8/QtCore -I sip -I /tmp/guix-build-python-pyqt-5.15.8.drv-2/PyQt5-5.15.8/sip /tmp/guix-build-python-pyqt-5.15.8.drv-2/PyQt5-5.15.8/sip/QtCore/QtCoremod.sip

If I run it by hand, it prints
.sip5-real: /tmp/guix-build-python-pyqt-5.15.8.drv-1/PyQt5-5.15.8/sip/QtCore/QtCoremod.sip:23: syntax error
This line 23 is very simple:
%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True)

And anyway, it is part of the source code...

There is a version 5.15.9 of PyQt (interestingly enough, not related to a
corresponding Qt version), with NEWS stating "Bug fixes", but what I have
written above is still valid.

At this point, I have to give up for lack of knowledge about sip.

Andreas


[-- Attachment #2: 0001-gnu-python-pyqt-Set-variable-in-configure-script.patch --]
[-- Type: text/plain, Size: 2518 bytes --]

From 82cb67b324e9ef63bb105caae5b778467aedf894 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Sat, 18 Mar 2023 15:48:48 +0100
Subject: [PATCH] gnu: python-pyqt: Set variable in configure script.

* gnu/packages/patches/pyqt-minimum-sip-version.patch: New file.
* gnu/packages/qt.scm (python-pyqt): Add patch.
* gnu/local.mk (dist_patch_DATA): Register patch.
---
 gnu/local.mk                                       |  1 +
 .../patches/pyqt-minimum-sip-version.patch         | 14 ++++++++++++++
 gnu/packages/qt.scm                                |  3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/pyqt-minimum-sip-version.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 43b7e4ceb3..d81f8ee0f8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1707,6 +1707,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/pybugz-stty.patch			\
   %D%/packages/patches/pygpgme-disable-problematic-tests.patch  \
   %D%/packages/patches/pyqt-configure.patch			\
+  %D%/packages/patches/pyqt-minimum-sip-version.patch           \
   %D%/packages/patches/python-2-deterministic-build-info.patch	\
   %D%/packages/patches/python-2.7-adjust-tests.patch		\
   %D%/packages/patches/python-2.7-expat-compat.patch		\
diff --git a/gnu/packages/patches/pyqt-minimum-sip-version.patch b/gnu/packages/patches/pyqt-minimum-sip-version.patch
new file mode 100644
index 0000000000..abcb4113e8
--- /dev/null
+++ b/gnu/packages/patches/pyqt-minimum-sip-version.patch
@@ -0,0 +1,14 @@
+Set the MinimumSipVersion to something, namely the currently available one.
+
+diff -u PyQt5-5.15.8.alt/configure.py PyQt5-5.15.8/configure.py
+--- PyQt5-5.15.8.alt/configure.py
++++ PyQt5-5.15.8/configure.py
+@@ -29,7 +29,7 @@ import sys
+ 
+ # Initialise the constants.
+ PYQT_VERSION_STR = "5.15.8"
+-SIP_MIN_VERSION = '@MinimumSipVersion@'
++SIP_MIN_VERSION = "5.5.0"
+ 
+ 
+ class ModuleMetadata:
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 22a33341bf..45d99c241c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3294,7 +3294,8 @@ (define-public python-pyqt
         (sha256
          (base32
           "0q53xn1ax2kpfqwxkasby787ryq5a21chmw1p345cp0kp7py71dw"))
-        (patches (search-patches "pyqt-configure.patch"))))
+        (patches (search-patches "pyqt-configure.patch"
+                                 "pyqt-minimum-sip-version.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      (list qtbase-5)) ; for qmake
-- 
2.39.2