qdigidoc: 4.2.3 -> 4.2.8
This commit is contained in:
parent
6f1857f2f2
commit
ce5e8c343b
|
@ -3,20 +3,23 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "qdigidoc";
|
pname = "qdigidoc";
|
||||||
version = "4.2.3";
|
version = "4.2.8";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/open-eid/DigiDoc4-Client";
|
url = "https://github.com/open-eid/DigiDoc4-Client";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1hj49vvg8vrayr9kpz73fafa7k298hmiamkyd8c3ipy6s51xh6q4";
|
sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
tsl = fetchurl {
|
tsl = fetchurl {
|
||||||
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
|
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
|
||||||
sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14";
|
sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# 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 ];
|
nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
39
pkgs/tools/security/qdigidoc/qt5.15.patch
Normal file
39
pkgs/tools/security/qdigidoc/qt5.15.patch
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
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;
|
Loading…
Reference in a new issue