diff options
| author | kk-boop <56920559+kk-boop@users.noreply.github.com> | 2021-12-19 16:06:53 +0200 |
|---|---|---|
| committer | kk-boop <56920559+kk-boop@users.noreply.github.com> | 2021-12-19 19:48:36 +0200 |
| commit | a4cf8b233e762c9ac11137b6eccce43403a735ec (patch) | |
| tree | f035084ec0cea8141b43066509ee9cc38728f665 /pkgs/tools/security/qdigidoc | |
| parent | fc4c000d4b43b9b71ebc4fa234a929ae36d2bfb9 (diff) | |
qdigidoc: 4.2.8 -> 4.2.9
Diffstat (limited to 'pkgs/tools/security/qdigidoc')
| -rw-r--r-- | pkgs/tools/security/qdigidoc/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/security/qdigidoc/qt5.15.patch | 39 |
2 files changed, 2 insertions, 44 deletions
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index ab2ac6f7c50c6..806c3f1f9dbc0 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "qdigidoc"; - version = "4.2.8"; + version = "4.2.9"; src = fetchgit { url = "https://github.com/open-eid/DigiDoc4-Client"; rev = "v${version}"; - sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm"; + sha256 = "0r5smd0qjskqyyv8vqh1ml9f8g65k0sw35m12sb5xlamjr43idjr"; fetchSubmodules = true; }; @@ -17,9 +17,6 @@ mkDerivation rec { sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d"; }; - # Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914) - patches = [ ./qt5.15.patch ]; - nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ]; postPatch = '' diff --git a/pkgs/tools/security/qdigidoc/qt5.15.patch b/pkgs/tools/security/qdigidoc/qt5.15.patch deleted file mode 100644 index 6f390702348b1..0000000000000 --- a/pkgs/tools/security/qdigidoc/qt5.15.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001 -From: Dmitri Smirnov <dmitri@smirnov.ee> -Date: Mon, 8 Mar 2021 14:15:27 +0100 -Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?= - =?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Dmitri Smirnov <dmitri@smirnov.ee> ---- - client/widgets/CheckBox.cpp | 1 + - client/widgets/MainAction.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp -index a03b56e5d..725d585b7 100644 ---- a/client/widgets/CheckBox.cpp -+++ b/client/widgets/CheckBox.cpp -@@ -22,6 +22,7 @@ - #include <QBrush> - #include <QPaintEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QStyleOptionButton> - - CheckBox::CheckBox(QWidget *parent) -diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp -index 4cf4bb1cf..a46c193e3 100644 ---- a/client/widgets/MainAction.cpp -+++ b/client/widgets/MainAction.cpp -@@ -24,6 +24,7 @@ - - #include <QtCore/QSettings> - #include <QtGui/QPainter> -+#include <QtGui/QPainterPath> - #include <QtGui/QPaintEvent> - - using namespace ria::qdigidoc4; |