From 4cf2fedb9643355dffc561b05175592ffe9dcdd3 Mon Sep 17 00:00:00 2001 From: augiedoggie Date: Sat, 4 Jul 2020 12:14:52 -0600 Subject: [PATCH] keepassxc: update to 2.5.4 (#5147) --- ...xc-2.3.4.recipe => keepassxc-2.5.4.recipe} | 20 ++-- .../patches/keepassxc-2.3.4.patchset | 102 ------------------ 2 files changed, 12 insertions(+), 110 deletions(-) rename app-admin/keepassxc/{keepassxc-2.3.4.recipe => keepassxc-2.5.4.recipe} (90%) delete mode 100644 app-admin/keepassxc/patches/keepassxc-2.3.4.patchset diff --git a/app-admin/keepassxc/keepassxc-2.3.4.recipe b/app-admin/keepassxc/keepassxc-2.5.4.recipe similarity index 90% rename from app-admin/keepassxc/keepassxc-2.3.4.recipe rename to app-admin/keepassxc/keepassxc-2.5.4.recipe index cbc5dfdd1..548cce238 100644 --- a/app-admin/keepassxc/keepassxc-2.3.4.recipe +++ b/app-admin/keepassxc/keepassxc-2.5.4.recipe @@ -25,13 +25,12 @@ COPYRIGHT=" 2000-2008, Tom Sato 2013, Laszlo Papp 2013, David Faure - 2016-2018, KeePassXC Team + 2016-2020, KeePassXC Team " LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/keepassxreboot/keepassxc/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="3610eccb06b04f901d5f5fbdbc4bd474d56a8e35f23c4a7873a844e44ba762b4" -PATCHES="keepassxc-$portVersion.patchset" +CHECKSUM_SHA256="ebb27af867548f765d2b3aeb3937ad34f429159f7ce12af7a5db6a744997c5aa" ADDITIONAL_FILES="keepassxc.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" @@ -47,6 +46,8 @@ REQUIRES=" lib:libgcrypt$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix lib:libmicrohttpd$secondaryArchSuffix + lib:libqrencode$secondaryArchSuffix + lib:libsodium$secondaryArchSuffix lib:libQt5Concurrent$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix @@ -63,6 +64,8 @@ BUILD_REQUIRES=" devel:libgcrypt$secondaryArchSuffix devel:libgpg_error$secondaryArchSuffix devel:libmicrohttpd$secondaryArchSuffix + devel:libqrencode$secondaryArchSuffix + devel:libsodium$secondaryArchSuffix devel:libQt5Concurrent$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5DBus$secondaryArchSuffix @@ -86,19 +89,20 @@ BUILD() cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ + -DKEEPASSXC_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_XC_NETWORKING=on \ -DWITH_XC_SSHAGENT=on \ + -DWITH_XC_AUTOTYPE=on \ + -DWITH_XC_UPDATECHECK=off \ -DWITH_TESTS=on \ - -DWITH_XC_AUTOTYPE=on + -DCMAKE_CXX_FLAGS="-D_GNU_SOURCE" make $jobArgs } 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 @@ -107,7 +111,7 @@ INSTALL() rm -rf $appIconsDir/scalable rm -rf $appIconsDir/16x16/apps rm -rf $appIconsDir/*/mimetypes - for i in 24 32 48 64 128 256; do + for i in 32 48 64 128 256; do rm -rf $appIconsDir/${i}x${i} done diff --git a/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset b/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset deleted file mode 100644 index ad8d7f0e7..000000000 --- a/app-admin/keepassxc/patches/keepassxc-2.3.4.patchset +++ /dev/null @@ -1,102 +0,0 @@ -From 0fd57d499ce574e2a13388a1c218ebcfb4086145 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Tue, 12 Feb 2019 15:57:57 +0300 -Subject: Haiku patch - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70f1479..3ad57f2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -170,11 +170,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - add_gcc_compiler_flags("-Werror") - endif() - -+if (NOT 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() - add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4") - endif() -+endif() - - add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti") - add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual") -diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt -index 81bb269..686af27 100644 ---- a/share/CMakeLists.txt -+++ b/share/CMakeLists.txt -@@ -23,7 +23,7 @@ file(GLOB DATABASE_ICONS icons/database/*.png) - - install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database) - --if(UNIX AND NOT APPLE) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor - FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz" - PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE) -@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE) - install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) - install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) --endif(UNIX AND NOT APPLE) -+endif(UNIX AND NOT APPLE AND NOT HAIKU) - - if(APPLE) - install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 28a0753..8c5465d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -272,6 +272,9 @@ if(APPLE) - target_link_libraries(keepassx_core Qt5::MacExtras) - endif() - endif() -+if(HAIKU) -+ target_link_libraries(keepassx_core network) -+endif() - 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 f6cc2e4..cad479c 100644 ---- a/src/gui/MainWindow.cpp -+++ b/src/gui/MainWindow.cpp -@@ -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(); - -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 - - --#ifdef _WIN32 -+#if defined(_WIN32) || defined(__HAIKU__) - #include - - typedef uint32_t u_int32_t; --- -2.19.1 -