qtkeychain: 0.9.1 -> 0.12.0 (#132457)

This commit is contained in:
Guillaume Girol 2021-08-05 07:26:28 +00:00 committed by GitHub
parent 3a27e7859e
commit 39e7ea6b47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 42 deletions

View file

@ -1,25 +0,0 @@
From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 4 Sep 2018 23:19:29 -0400
Subject: [PATCH] Fixes build with Qt4.
---
keychain_unix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keychain_unix.cpp b/keychain_unix.cpp
index 30b26c3..b27ebef 100644
--- a/keychain_unix.cpp
+++ b/keychain_unix.cpp
@@ -91,7 +91,7 @@ static bool isKwallet5Available()
// a wallet can be opened.
iface.setTimeout(500);
- QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
+ QDBusMessage reply = iface.call("networkWallet");
return reply.type() == QDBusMessage::ReplyMessage;
}
--
2.16.4

View file

@ -1,27 +1,22 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null { lib, stdenv, fetchFromGitHub, cmake, pkg-config, qtbase, qttools
, withQt5 ? false, qtbase ? null, qttools ? null , CoreFoundation, Security
, darwin ? null
, libsecret , libsecret
}: }:
assert withQt5 -> qtbase != null;
assert withQt5 -> qttools != null;
assert stdenv.isDarwin -> darwin != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; pname = "qtkeychain";
version = "0.9.1"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` version = "0.12.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frankosterfeld"; owner = "frankosterfeld";
repo = "qtkeychain"; repo = "qtkeychain";
rev = "v${version}"; rev = "v${version}";
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1
}; };
dontWrapQtApps = true; dontWrapQtApps = true;
patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); patches = [ ./0002-Fix-install-name-Darwin.patch ];
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
@ -30,10 +25,10 @@ stdenv.mkDerivation rec {
; ;
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) ++ [ qtbase qttools ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ lib.optionals stdenv.isDarwin [
CoreFoundation Security CoreFoundation Security
]) ]
; ;
meta = { meta = {

View file

@ -686,6 +686,7 @@ mapAliases ({
qvim = throw "qvim has been removed."; # added 2020-08-31 qvim = throw "qvim has been removed."; # added 2020-08-31
qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08
qwt6 = libsForQt5.qwt; # added 2015-12-19 qwt6 = libsForQt5.qwt; # added 2015-12-19
qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04
qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtcurve = libsForQt5.qtcurve; # added 2020-11-07
qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09

View file

@ -18278,8 +18278,6 @@ in
qtEnv = qt5.env; qtEnv = qt5.env;
qt5Full = qt5.full; qt5Full = qt5.full;
qtkeychain = callPackage ../development/libraries/qtkeychain { };
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
quesoglc = callPackage ../development/libraries/quesoglc { }; quesoglc = callPackage ../development/libraries/quesoglc { };

View file

@ -183,7 +183,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtinstaller = callPackage ../development/libraries/qtinstaller { };
qtkeychain = callPackage ../development/libraries/qtkeychain { qtkeychain = callPackage ../development/libraries/qtkeychain {
withQt5 = true; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };