Skip to content

Commit

Permalink
pyqtwebengine: add patch to fix build with Qt 5.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Milan Pässler authored and Milan committed Jul 31, 2020
1 parent cb1b535 commit ae66138
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/pyqtwebengine/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ in buildPythonPackage rec {
sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237";
};

patches = [
# source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
./fix-build-with-qt-514.patch
];

outputs = [ "out" "dev" ];

nativeBuildInputs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -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
};

0 comments on commit ae66138

Please sign in to comment.