movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

pyqtwebengine: add patch to fix build with Qt 5.14

Browse source
This commit is contained in:
Milan Pässler 2020-07-30 14:06:52 +02:00 • committed by Milan
parent cb1b5351e4
commit ae661388c6
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/python-modules/pyqtwebengine/default.nix
View file

@ -18,6 +18,11 @@ in buildPythonPackage rec {
sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237";
}; };
patches = [
# source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
./fix-build-with-qt-514.patch
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [

31
pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch Normal file
View file

@ -0,0 +1,31 @@
diff --git a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip
index 5fb508f..7a4654a 100644
--- a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip
+++ b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip
@@ -48,7 +48,7 @@ public:
%If (QtWebEngine_5_8_0 -)
CertificateTransparencyRequired,
%End
-%If (QtWebEngine_5_14_0 -)
+%If (QtWebEngine_5_15_0 -)
CertificateKnownInterceptionBlocked,
%End
};
diff --git a/sip/QtWebEngineWidgets/qwebenginepage.sip b/sip/QtWebEngineWidgets/qwebenginepage.sip
index 0dcbed2..9aa3443 100644
--- a/sip/QtWebEngineWidgets/qwebenginepage.sip
+++ b/sip/QtWebEngineWidgets/qwebenginepage.sip
@@ -663,10 +663,10 @@ signals:
%End
public:
-%If (QtWebEngine_5_14_0 -)
+%If (QtWebEngine_5_15_0 -)
qint64 renderProcessPid() const;
%End
-%If (QtWebEngine_5_14_0 -)
+%If (QtWebEngine_5_15_0 -)
void renderProcessPidChanged(qint64 pid);
%End
};