>From 82cb67b324e9ef63bb105caae5b778467aedf894 Mon Sep 17 00:00:00 2001 From: Andreas Enge 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