pyrox.dev
Merge pull request #125719 from kk-boop/qdigidoc-update
+6
-3
pkgs/tools/security/qdigidoc/default.nix
+6
-3
pkgs/tools/security/qdigidoc/default.nix
···
3
3
4
4
mkDerivation rec {
5
5
pname = "qdigidoc";
6
-
version = "4.2.3";
6
+
version = "4.2.8";
7
7
8
8
src = fetchgit {
9
9
url = "https://github.com/open-eid/DigiDoc4-Client";
10
10
rev = "v${version}";
11
-
sha256 = "1hj49vvg8vrayr9kpz73fafa7k298hmiamkyd8c3ipy6s51xh6q4";
11
+
sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm";
12
12
fetchSubmodules = true;
13
13
};
14
14
15
15
tsl = fetchurl {
16
16
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
17
-
sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14";
17
+
sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";
18
18
};
19
+
20
+
# Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914)
21
+
patches = [ ./qt5.15.patch ];
19
22
20
23
nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
21
24
+39
pkgs/tools/security/qdigidoc/qt5.15.patch
+39
pkgs/tools/security/qdigidoc/qt5.15.patch
···
1
+
From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001
2
+
From: Dmitri Smirnov <dmitri@smirnov.ee>
3
+
Date: Mon, 8 Mar 2021 14:15:27 +0100
4
+
Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?=
5
+
=?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?=
6
+
MIME-Version: 1.0
7
+
Content-Type: text/plain; charset=UTF-8
8
+
Content-Transfer-Encoding: 8bit
9
+
10
+
Signed-off-by: Dmitri Smirnov <dmitri@smirnov.ee>
11
+
---
12
+
client/widgets/CheckBox.cpp | 1 +
13
+
client/widgets/MainAction.cpp | 1 +
14
+
2 files changed, 2 insertions(+)
15
+
16
+
diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp
17
+
index a03b56e5d..725d585b7 100644
18
+
--- a/client/widgets/CheckBox.cpp
19
+
+++ b/client/widgets/CheckBox.cpp
20
+
@@ -22,6 +22,7 @@
21
+
#include <QBrush>
22
+
#include <QPaintEvent>
23
+
#include <QPainter>
24
+
+#include <QPainterPath>
25
+
#include <QStyleOptionButton>
26
+
27
+
CheckBox::CheckBox(QWidget *parent)
28
+
diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp
29
+
index 4cf4bb1cf..a46c193e3 100644
30
+
--- a/client/widgets/MainAction.cpp
31
+
+++ b/client/widgets/MainAction.cpp
32
+
@@ -24,6 +24,7 @@
33
+
34
+
#include <QtCore/QSettings>
35
+
#include <QtGui/QPainter>
36
+
+#include <QtGui/QPainterPath>
37
+
#include <QtGui/QPaintEvent>
38
+
39
+
using namespace ria::qdigidoc4;