haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

KeePassXC: Enable and fix build on x86_64 (#1556)

Browse Source 
* KeePassXC: Enable and fix build on x86_64

* Bump revision

* Switch off unit tests the correct way
This commit is contained in:
Chris Moore
2017-08-03 19:33:40 +01:00
committed by diversys
parent 145f454853
commit 92a28aaf17
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app-admin/keepassxc/keepassxc-2.1.0.recipe
View File

@@ -24,13 +24,13 @@ COPYRIGHT="2010-2012 Felix Geyer
2012 Nokia Corporation and/or its subsidiary(-ies)
2000-2008 Tom Sato"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/keepassxreboot/keepassxc/releases/download/$portVersion/keepassxc-$portVersion-src.tar.bz2"
CHECKSUM_SHA256="23a39aeda8f2e6263b0821826cfb8735275fba104712748c7a5e41e1f87fb0a6"
PATCHES="keepassxc-2.1.0.patchset"
ADDITIONAL_FILES="keepassxc.rdef"
ARCHITECTURES="x86 ?x86_64"
ARCHITECTURES="x86 x86_64"
PROVIDES="
keepassxc = $portVersion
@@ -74,7 +74,7 @@ BUILD()
cmake -DCMAKE_INSTALL_PREFIX=$prefix \
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_TESTS=on -DWITH_XC_AUTOTYPE=on.
-DWITH_TESTS=off -DWITH_XC_AUTOTYPE=on.
make $jobArgs

26
app-admin/keepassxc/patches/keepassxc-2.1.0.patchset
View File

@@ -1,4 +1,4 @@
From 6afc6a829705866dca58ec9e076256bcdeccb475 Mon Sep 17 00:00:00 2001
From 669d3119fc71a275691591910da81124a9c03c51 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Thu, 26 Jan 2017 21:24:52 +0100
Subject: Haiku support
@@ -39,5 +39,27 @@ index a77f80a..a688f0a 100644
if(APPLE)
install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
--
2.2.2
2.13.1
From 30c2ae94a91e1945f15ebfe3ffcbc10c65f7bc7c Mon Sep 17 00:00:00 2001
From: Chris Moore <chris@mooreonline.org>
Date: Thu, 3 Aug 2017 16:45:41 +0100
Subject: Fix invalid parameter types
diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp
index dfb03bd..5194451 100644
--- a/src/format/KeePass2XmlReader.cpp
+++ b/src/format/KeePass2XmlReader.cpp
@@ -388,7 +388,7 @@ void KeePass2XmlReader::parseBinaries()
QString id = attr.value("ID").toString();
QByteArray data;
- if (attr.value("Compressed").compare("True", Qt::CaseInsensitive) == 0) {
+ if (attr.value("Compressed").compare(QString("True"), Qt::CaseInsensitive) == 0) {
data = readCompressedBinary();
}
else {
--
2.13.1