keepassxc: 2.2.4 -> 2.3.0 #36133
Closed
keepassxc: 2.2.4 -> 2.3.0 #36133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
|
@GrahamcOfBorg build keepassxc |
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
|
Is the browser extension build by default? |
|
I would suggest to disable KeePassHTTP by default: |
jonafato
reviewed
Feb 28, 2018
| , qtbase | ||
| , qtx11extras | ||
| , yubikey-personalization | ||
| , zlib | ||
| , withKeePassHTTP ? true |
There was a problem hiding this comment.
This is missing options for withKeePassBrowser (requires a new dependency on libsodium), withNetworking, and withSSHAgent and their equivalent CMAKE flags.
To preserve the spirit of the existing configuration, withKeePassBrowser should likely default to true.
| }; | ||
|
|
||
| patches = [ ./cmake.patch ./darwin.patch ]; | ||
|
|
||
| cmakeFlags = [ | ||
| "-DWITH_GUI_TESTS=ON" |
There was a problem hiding this comment.
You'll want to add "-DKEEPASSXC_BUILD_TYPE=Release" to avoid a big prerelease warning in the UI.
| , qtbase | ||
| , qtx11extras | ||
| , yubikey-personalization | ||
| , zlib | ||
| , withKeePassHTTP ? true |
There was a problem hiding this comment.
Echoing @Mic92, KeePassHTTP is deprecated and should be disabled by default.
| }; | ||
|
|
||
| patches = [ ./cmake.patch ./darwin.patch ]; |
There was a problem hiding this comment.
The cmake.patch file should be removed if it's no longer needed.
| }; | ||
|
|
||
| patches = [ ./cmake.patch ./darwin.patch ]; |
There was a problem hiding this comment.
Is darwin.patch not necessary anymore? (I don't use MacOS and can't verify whether or not it's still needed.) If it still is, here's an updated version that applies against the 2.3.0 tag:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7410b4e0..0fd39403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,8 +250,8 @@ else()
set(PROGNAME keepassxc)
endif()
-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
- set(CMAKE_INSTALL_PREFIX "/Applications")
+if(APPLE AND WITH_APP_BUNDLE)
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
endif()
@@ -262,7 +262,7 @@ if(MINGW)
set(PLUGIN_INSTALL_DIR ".")
set(DATA_INSTALL_DIR "share")
elseif(APPLE AND WITH_APP_BUNDLE)
- set(CLI_INSTALL_DIR "/usr/local/bin")
+ set(CLI_INSTALL_DIR "../bin")
set(PROXY_INSTALL_DIR "/usr/local/bin")
set(BIN_INSTALL_DIR ".")
set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69526967..38f7c5d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
include(CPack)
- add_custom_command(TARGET ${PROGNAME}
- POST_BUILD
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
- COMMENT "Deploying app bundle")
endif()
install(TARGETS ${PROGNAME}
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
index 08c53278..b833b692 100644
--- a/src/autotype/mac/CMakeLists.txt
+++ b/src/autotype/mac/CMakeLists.txt
@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
add_custom_command(TARGET keepassx-autotype-cocoa
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
COMMENT "Deploying autotype plugin")
else()
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
|
@jonafato can you take over? I'm probably not going to finish this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
HN-driven development. https://news.ycombinator.com/item?id=16483722
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)