cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #151353 from kk-boop/qdigidoc_429

Browse source 
qdigidoc: 4.2.8 -> 4.2.9
This commit is contained in:
Bobby Rong 2021-12-25 19:02:14 +08:00 committed by GitHub
commit 8cba532640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/tools/security/qdigidoc/default.nix
View file

@ -1,25 +1,22 @@
{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config
, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
{ lib, mkDerivation, fetchurl, cmake, darkhttpd, gettext, makeWrapper
, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
, qttranslations, qtsvg }:
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";
fetchSubmodules = true;
src = fetchurl {
url =
"https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
sha256 = "1rhd3mvj6ld16zgfscj81f1vhs2nvifsizky509l1av7dsjfbbzr";
};
tsl = fetchurl {
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";
url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-300.xml";
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 = ''

39
pkgs/tools/security/qdigidoc/qt5.15.patch
View file

@ -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;