From 92a28aaf17094c2fee4f2adc0567e3713c3c7cfd Mon Sep 17 00:00:00 2001
From: Chris Moore <chris@mooreonline.org>
Date: Thu, 3 Aug 2017 19:33:40 +0100
Subject: [PATCH] KeePassXC: Enable and fix build on x86_64 (#1556)

* KeePassXC: Enable and fix build on x86_64

* Bump revision

* Switch off unit tests the correct way
---
 app-admin/keepassxc/keepassxc-2.1.0.recipe    |  6 ++---
 .../patches/keepassxc-2.1.0.patchset          | 26 +++++++++++++++++--
 .../libmicrohttpd/libmicrohttpd-0.9.44.recipe |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.1.0.recipe b/app-admin/keepassxc/keepassxc-2.1.0.recipe
index 11342f52e..28488271b 100644
--- a/app-admin/keepassxc/keepassxc-2.1.0.recipe
+++ b/app-admin/keepassxc/keepassxc-2.1.0.recipe
@@ -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
 
diff --git a/app-admin/keepassxc/patches/keepassxc-2.1.0.patchset b/app-admin/keepassxc/patches/keepassxc-2.1.0.patchset
index 23a3def4d..6948eda16 100644
--- a/app-admin/keepassxc/patches/keepassxc-2.1.0.patchset
+++ b/app-admin/keepassxc/patches/keepassxc-2.1.0.patchset
@@ -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
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe b/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe
index 7cca9d1fc..4e5ae698f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe
@@ -33,7 +33,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$portVersion.tar.
 CHECKSUM_SHA256="f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e"
 PATCHES="libmicrohttpd-0.9.44.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="