KeePassXC: bump version

app-admin/keepassxc/keepassxc-2.3.4.recipe

@@ -25,12 +25,12 @@ COPYRIGHT="
 	2000-2008, Tom Sato
 	2013, Laszlo Papp
 	2013, David Faure
-	2016-2017, KeePassXC Team
+	2016-2018, KeePassXC Team
 	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/keepassxreboot/keepassxc/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="e884439ed3ad461e426a25f0492f5fa78ab8ba06fb718977b3867d8f098ccd0a"
+CHECKSUM_SHA256="3610eccb06b04f901d5f5fbdbc4bd474d56a8e35f23c4a7873a844e44ba762b4"
 PATCHES="keepassxc-$portVersion.patchset"
 ADDITIONAL_FILES="keepassxc.rdef.in"
 
@@ -43,6 +43,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libargon2$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libmicrohttpd$secondaryArchSuffix
@@ -58,6 +59,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libargon2$secondaryArchSuffix
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
 	devel:libmicrohttpd$secondaryArchSuffix
@@ -73,16 +75,22 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
 BUILD()
 {
-	cmake -DCMAKE_INSTALL_PREFIX=$prefix \
+	mkdir -p build ; cd build
+
+	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
 	-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DWITH_TESTS=on -DWITH_XC_AUTOTYPE=on .
+	-DWITH_XC_NETWORKING=on \
+	-DWITH_XC_SSHAGENT=on \
+	-DWITH_TESTS=on \
+	-DWITH_XC_AUTOTYPE=on
 
 	make $jobArgs
 }
@@ -92,6 +100,7 @@ INSTALL()
 #	TODO: adjust path for /boot/home/.config/keepassxc/keepassxc.ini
 #	TODO: replace icon with the one from keepassxc.svgz
 #	TODO: replace toolbar icons with https://github.com/HaikuArchives/ZumisIcons/tree/master/myhaiku/btoolbar
+	cd build
 	make install
 
 	appIconsDir=$dataDir/keepassxc/icons/application

app-admin/keepassxc/patches/keepassxc-2.3.4.patchset

@@ -1,18 +1,18 @@
-From 7ddd3be455c9a683ea48d9dfd056e0ce5db7cb99 Mon Sep 17 00:00:00 2001
+From 8f01c028bc37fe1c301b4e0fb4a89da36800bccb Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 18 Dec 2017 16:14:39 +0300
+Date: Tue, 12 Feb 2019 15:57:57 +0300
 Subject: Haiku patch
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 479ea86..28dfdb8 100644
+index 70f1479..08d4918 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -101,11 +101,13 @@ add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
- add_gcc_compiler_flags("-fvisibility=hidden")
- add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
+@@ -170,11 +170,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+   add_gcc_compiler_flags("-Werror")
+ endif()
  
-+if (UNIX AND NOT HAIKU)
++if (HAIKU)
  if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
      add_gcc_compiler_flags("-fstack-protector-strong")
  else()
@@ -45,12 +45,12 @@ index 81bb269..686af27 100644
  if(APPLE)
    install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5255186..5be9c3c 100644
+index 28a0753..8c5465d 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -230,6 +230,9 @@ target_link_libraries(keepassx_core
- if(APPLE)
-     target_link_libraries(keepassx_core "-framework Foundation")
+@@ -272,6 +272,9 @@ if(APPLE)
+       target_link_libraries(keepassx_core Qt5::MacExtras)
+     endif()
  endif()
 +if(HAIKU)
 +    target_link_libraries(keepassx_core network)
@@ -58,23 +58,45 @@ index 5255186..5be9c3c 100644
  if (UNIX AND NOT APPLE)
      target_link_libraries(keepassx_core Qt5::DBus)
  endif()
+diff --git a/src/autotype/CMakeLists.txt b/src/autotype/CMakeLists.txt
+index 4b36105..df21c01 100644
+--- a/src/autotype/CMakeLists.txt
++++ b/src/autotype/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if(WITH_XC_AUTOTYPE)
+-  if(UNIX AND NOT APPLE)
++  if(UNIX AND NOT APPLE AND NOT HAIKU)
+     find_package(X11)
+     find_package(Qt5X11Extras 5.2)
+     if(PRINT_SUMMARY)
 diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
-index e37a7d2..49e4ac9 100644
+index f6cc2e4..cad479c 100644
 --- a/src/gui/MainWindow.cpp
 +++ b/src/gui/MainWindow.cpp
-@@ -333,10 +333,10 @@ MainWindow::MainWindow()
-     connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(hideGlobalMessage()));
+@@ -413,8 +413,10 @@ MainWindow::MainWindow()
      connect(m_ui->tabWidget, SIGNAL(messageTab(QString,MessageWidget::MessageType)), this, SLOT(displayTabMessage(QString, MessageWidget::MessageType)));
      connect(m_ui->tabWidget, SIGNAL(messageDismissTab()), this, SLOT(hideTabMessage()));
--
+ 
 +#ifndef Q_OS_HAIKU
      m_screenLockListener = new ScreenLockListener(this);
      connect(m_screenLockListener, SIGNAL(screenLocked()), SLOT(handleScreenLock()));
--
 +#endif
+ 
      updateTrayIcon();
  
-     if (config()->hasAccessError()) {
+diff --git a/src/sshagent/includes.h b/src/sshagent/includes.h
+index c6bb4d3..efcdbe5 100644
+--- a/src/sshagent/includes.h
++++ b/src/sshagent/includes.h
+@@ -9,7 +9,7 @@
+ #include <sys/types.h>
+ 
+ 
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__HAIKU__)
+ #include <stdint.h>
+ 
+ typedef uint32_t u_int32_t;
 -- 
-2.15.0
+2.19.1