<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f04779ab14e9bd538dab3188d880bc5499760400">https://github.com/macports/macports-ports/commit/f04779ab14e9bd538dab3188d880bc5499760400</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f04779ab14e KeePassXC: upgrade to 2.7.0
</span>f04779ab14e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f04779ab14e9bd538dab3188d880bc5499760400
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Fri Mar 25 09:22:49 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: upgrade to 2.7.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And also upgrade KeePassXC-devel to latest upstream devel commit
</span>---
security/KeePassXC/Portfile | 72 +++-----
.../KeePassXC/files/devel/patch-no-deployqt.diff | 72 --------
.../files/devel/patch-no-findpackage-path.diff | 22 ---
security/KeePassXC/files/patch-no-deployqt.diff | 50 ++----
.../KeePassXC/files/patch-no-findpackage-path.diff | 16 +-
security/KeePassXC/files/patch-old-mac.diff | 185 ---------------------
security/KeePassXC/files/patch-quazip.diff | 45 -----
security/KeePassXC/files/patch-touch-id.diff | 43 +++++
8 files changed, 100 insertions(+), 405 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6258a24e57f..e159ab3086d 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@ license_noconflict openssl
</span>
if {${subport} eq ${name}} {
# stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 2.6.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,62 +43,33 @@ if {${subport} eq ${name}} {
</span>
# See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c3933aadf16a103f3ae4a5c2150a4c298e15dbe0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7640532 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fcf7ffbe37c127f24d4e16f6534fa0c3ef4dd1fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83be76890904cd6703343fa097d68bcfdd99bb525cf518fa62a7df9293026aa7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8846780 \
</span> ${distname}${extract.suffix}.sig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e1e03a47d09e8caea290cba591ee4b15e33fa286 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 162e577f790bd254aa73db388dd91c0f34e57dac5b83ae831bc72c3c12ad00e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b6e7541eb6556f0dd2b8c826a704570a185aeca1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 031c60741148076a9ec0d6b67d31a608c0e7639215a4291a2a107bd961b38e73 \
</span> size 488
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:quazip1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_XC_KEESHARE_SECURE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-no-deployqt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-quazip.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-old-mac.diff
</span> } else {
# devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 0ad75ccb8fa4228880b035516eb9905517f8b12f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 4178e72fe04eb97d0787c006b03993c87baa26c3
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20220307+git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20220323+git${githash}
</span> revision 0
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 24a38c4d0d97ae73f1bbfb3ebba9f6e525c10be7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce0c8531e93d3981280fe0044909ef05d9f4c47314f82eab801b98e6b1b8d4e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10637994
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f330d85018a430b54e3e5aca93baba8722ab18e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 04011a97e0f25ccc5cfe12608a61e01174f8102017661add361636a01b619c44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11205362
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:minizip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles devel/patch-no-deployqt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QTest::addRow was introduced in Qt 5.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't build tests in that case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} 5.9] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append -DWITH_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${applications_dir}/KeePassXC.app/Contents/MacOS/keepassxc-proxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/keepassxc-proxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,13 +92,19 @@ qt5.depends_build_component \
</span> qttools
depends_lib-append port:argon2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:botan \
</span> port:libgcrypt \
port:libsodium \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:minizip \
</span> port:readline \
port:qrencode \
port:ykpers \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-deployqt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
# available until clang 602 [2] or upstream clang 3.5 [3]
# [1] https://github.com/keepassxreboot/keepassxc/blob/develop/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,9 +114,12 @@ depends_lib-append port:argon2 \
</span> # https://github.com/llvm-project/clang/blob/release_35/lib/CodeGen/CodeGenModule.cpp
compiler.blacklist-append {clang < 602}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args-append \
-DCMAKE_INSTALL_PREFIX=${applications_dir} \
-DCMAKE_INSTALL_MANDIR=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_PREFIX_PATH=${qt_cmake_module_dir} \
</span> -DKEEPASSXC_BUILD_TYPE=Release \
-DWITH_XC_BROWSER=ON \
-DWITH_XC_KEESHARE=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,10 +129,10 @@ configure.pre_args-append \
</span> -DWITH_XC_UPDATECHECK=OFF \
-DWITH_XC_DOCS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# In the future the Touch ID feature may require Darwin 17 (10.13)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/keepassxreboot/keepassxc/issues/2484
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append -DWITH_XC_TOUCHID=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# QTest::addRow was introduced in Qt 5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't build tests in that case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} 5.9] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-append -DWITH_TESTS=OFF
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,6 +144,8 @@ post-destroot {
</span>
ln -s ${applications_dir}/KeePassXC.app/Contents/MacOS/keepassxc-cli \
${destroot}${prefix}/bin/keepassxc-cli
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/KeePassXC.app/Contents/MacOS/keepassxc-proxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/keepassxc-proxy
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-deployqt.diff b/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37c29d1b259..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -453,11 +453,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_MACOSX_RPATH TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT MACDEPLOYQT_EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "macdeployqt is required to build on macOS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/debug/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT WINDEPLOYQT_EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -404,11 +404,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CPack)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(TARGET ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app 2> /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMENT "Deploying app bundle")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/autotype/mac/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/autotype/mac/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,10 +10,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_APP_BUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(TARGET keepassxc-autotype-cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassxc-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}/libkeepassxc-autotype-cocoa.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Copying autotype plugin into app bundle")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- kpxc_run_macdeployqt_on_installed_helper_binary(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${PROGNAME}" "${PLUGIN_INSTALL_DIR}/libkeepassxc-autotype-cocoa.so")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cli/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cli/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,10 +74,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(TARGET keepassxc-cli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CLI_APP_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/keepassxc-cli ${CLI_APP_DIR}/keepassxc-cli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Copying keepassxc-cli into app bundle")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- kpxc_run_macdeployqt_on_installed_helper_binary(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${PROGNAME}" "${CLI_INSTALL_DIR}/keepassxc-cli")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/proxy/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/proxy/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,12 +33,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PROXY_APP_DIR "${CMAKE_BINARY_DIR}/src/${PROXY_INSTALL_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(TARGET keepassxc-proxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROXY_APP_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/keepassxc-proxy ${PROXY_APP_DIR}/keepassxc-proxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Copying keepassxc-proxy into app bundle")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- kpxc_run_macdeployqt_on_installed_helper_binary(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${PROGNAME}" "${PROXY_INSTALL_DIR}/keepassxc-proxy")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-findpackage-path.diff b/security/KeePassXC/files/devel/patch-no-findpackage-path.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 22563fdd20f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes: https://trac.macports.org/ticket/61740
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -424,16 +424,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus X11Extras REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Cellar/qt/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/homebrew/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5 COMPONENTS MacExtras HINTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Cellar/qt/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/homebrew/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Qt5 COMPONENTS MacExtras)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-no-deployqt.diff b/security/KeePassXC/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3dab9d91d3b..6365d286780 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +1,27 @@
</span> --- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -423,12 +423,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -471,11 +463,6 @@
</span>
if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
</span> - if(NOT MACDEPLOYQT_EXE)
- message(FATAL_ERROR "macdeployqt is required to build on macOS")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
</span> - endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT WINDEPLOYQT_EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -408,11 +408,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CPack)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(TARGET ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMENT "Deploying app bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(MACDEPLOYQT_EXTRA_BINARIES "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/post_install/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/post_install/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,9 +5,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Run macdeloyqt on the main app and any extra binaries and plugins as specified by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _MACDEPLOYQT_EXTRA_BINARIES global property.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # All install(TARGETS) calls should have already been called.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_property(MACDEPLOYQT_EXTRA_BINARIES GLOBAL PROPERTY _MACDEPLOYQT_EXTRA_BINARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kpxc_run_macdeployqt_at_install_time(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- APP_NAME "${PROGNAME}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EXTRA_BINARIES ${MACDEPLOYQT_EXTRA_BINARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_property(MACDEPLOYQT_EXTRA_BINARIES GLOBAL PROPERTY _MACDEPLOYQT_EXTRA_BINARIES)
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/autotype/mac/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/autotype/mac/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,8 +7,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_APP_BUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(TARGET keepassx-autotype-cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Deploying autotype plugin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-no-findpackage-path.diff b/security/KeePassXC/files/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d31dcc6c45f..36cbb1cb0ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,20 @@
</span> Fixes: https://trac.macports.org/ticket/61740
--- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -402,8 +402,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,16 +442,8 @@
</span> if(UNIX AND NOT APPLE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus X11Extras REQUIRED)
</span> elseif(APPLE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5 COMPONENTS MacExtras HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/Cellar/qt/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/homebrew/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Qt5 COMPONENTS MacExtras HINTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/Cellar/qt/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/homebrew/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENV PATH)
</span> + find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
+ find_package(Qt5 COMPONENTS MacExtras)
else()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-old-mac.diff b/security/KeePassXC/files/patch-old-mac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index adae2aa2932..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-old-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,185 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: Syntax is not understood by 10.7, update it to be understandable by <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: expected method to read dictionary element not found on object of type 'NSDictionary *'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRunningApplication* app = userInfo[NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@ - (id) initWithObject:(AppKit*)appkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) didDeactivateApplicationObserver:(NSNotification*) notification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSDictionary* userInfo = notification.userInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSRunningApplication* app = userInfo[NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRunningApplication* app = [userInfo objectForKey:NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (app.processIdentifier != [self ownProcessId]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.lastActiveApplication = app;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation when osx <= 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: The code uses @available syntax which is new in clang 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This prevents compilation on older version of macOS that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use this version. For example on El Capitan.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: button property is new in 10.10. It is used for a feature of KeePassXC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- that is only available from 10.17 onwards. So we don't need it when compiling on <= 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: property 'button' not found on object of type 'NSStatusItem *'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString* appearance = [dummy.button.effectiveAppearance.name lowercaseString];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,6 +139,7 @@ - (bool) isDarkMode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) isStatusBarDark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.17, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This is an ugly hack, but I couldn't find a way to access QTrayIcon's NSStatusItem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSStatusItem* dummy = [[NSStatusBar systemStatusBar] statusItemWithLength:0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +147,7 @@ - (bool) isStatusBarDark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSStatusBar systemStatusBar] removeStatusItem:dummy];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [appearance containsString:@"dark"];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [self isDarkMode];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation when osx <= 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: AXIsProcessTrustedWithOptions exists from 10.9 onwards
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: use of undeclared identifier 'kAXTrustedCheckOptionPrompt'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: use of undeclared identifier 'AXIsProcessTrustedWithOptions'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,9 +168,15 @@ - (void) userSwitchHandler:(NSNotification*) notification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) enableAccessibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Request accessibility permissions for Auto-Type type on behalf of the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSDictionary* opts = @{static_cast<id>(kAXTrustedCheckOptionPrompt): @YES};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef>(opts));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (@available(macOS 10.9, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Request accessibility permissions for Auto-Type type on behalf of the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSDictionary* opts = @{static_cast<id>(kAXTrustedCheckOptionPrompt): @YES};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef>(opts));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: The code uses @available syntax which is new in clang 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This prevents compilation on older version of macOS that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use this version. For example on El Capitan.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: CGDisplayStreamRef exists from 10.8 onwards only. It is used for a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- feature of KeePassXC that is only available from 10.15 onwards. So we don't need it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- when compiling on <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: unknown type name 'CGDisplayStreamRef'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,6 +178,7 @@ - (bool) enableAccessibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) enableScreenRecording
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.15, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Request screen recording permission on macOS 10.15+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This is necessary to get the current window title
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,6 +196,7 @@ - (bool) enableScreenRecording
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] fix compilation on Qt not having QOperatingSystemVersion::MacOSBigSur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The code uses 'QOperatingSystemVersion::MacOSBigSur' which doesn't exist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in all Qt versions (it has been backported to Qt 5.12.10+ & 5.15.1+ only).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On older macos systems like El Capitan the last supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version of Qt is 5.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This will fix compilation issue on such older systems and on systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-running with Qt not supporting QOperatingSystemVersion::MacOSBigSur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Compilation error was:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: no member named 'MacOSBigSur' in 'QOperatingSystemVersion'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,8 +53,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qdrawutil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QOperatingSystemVersion>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,16 +281,22 @@ namespace Phantom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QColor tabBarBase(const QPalette& pal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 10) && QT_VERSION < QT_VERSION_CHECK(5, 13, 0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hack_isLightPalette(pal) ? QRgb(0xD4D4D4) : QRgb(0x2A2A2A);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hack_isLightPalette(pal) ? QRgb(0xDD1D1D1) : QRgb(0x252525);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QColor tabBarBaseInactive(const QPalette& pal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 10) && QT_VERSION < QT_VERSION_CHECK(5, 13, 0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hack_isLightPalette(pal) ? QRgb(0xF5F5F5) : QRgb(0x2D2D2D);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hack_isLightPalette(pal) ? QRgb(0xF4F4F4) : QRgb(0x282828);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* MacUtils.cpp: CoreGraphics exists from 10.8 onwards only, capslock detection feature
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- would have to be implemented on OSX < 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,8 +24,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QStandardPaths>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTimer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreGraphics/CGEventSource.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QPointer<MacUtils> MacUtils::m_instance = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +137,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool MacUtils::isCapslockEnabled()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (CGEventSourceFlagsState(kCGEventSourceStateHIDSystemState) & kCGEventFlagMaskAlphaShift) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-quazip.diff b/security/KeePassXC/files/patch-quazip.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a1430605b1c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-quazip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6cfadfaabafed8d0db213044a0bd22537609381c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 13 Nov 2021 15:11:35 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] add support for QuaZip >= 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/keeshare/CMakeLists.txt | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/keeshare/CMakeLists.txt b/src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af4bc61a8d..8749c2e4ec 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,14 @@ if(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Try to find libquazip5, if found, enable secure sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(QuaZip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(QuaZip-Qt5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(QuaZip-Qt5_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Using QuaZip-Qt5 (quazip ${QuaZip-Qt5_VERSION})")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(keeshare SYSTEM PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(keeshare PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(NOT QuaZip-Qt5_FOUND AND QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Using QuaZip (quazip <1.0)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(keeshare SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(keeshare PRIVATE ${QUAZIP_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Find quazip.h as installed by version 0.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-quazip 0.9 has quazip.h in /opt/local/include/quazip5/quazip.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-quazip 1.1 has quazip.h in /opt/local/include/QuaZip-Qt5-1.1/quazip/quazip.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/FindQuaZip.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindQuaZip.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_path(QUAZIP_INCLUDE_DIRS quazip.h PATH_SUFFIXES quazip5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(QUAZIP_LIBRARIES quazip1-qt5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_path(QUAZIP_INCLUDE_DIRS quazip.h PATH_SUFFIXES quazip)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(QUAZIP_INCLUDE_DIRS quazip.h PATH_SUFFIXES quazip quazip5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Try pkgconfig first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(PkgConfig QUIET)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-touch-id.diff b/security/KeePassXC/files/patch-touch-id.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3a4a012fb35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,10 +105,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101201
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sacObject = SecAccessControlCreateWithFlags(kCFAllocatorDefault,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kSecAccessControlTouchIDCurrentSet, // depr: kSecAccessControlBiometryCurrentSet,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,6 +238,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool TouchID::isAvailable()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 101201
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // cache result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (this->m_available != TOUCHID_UNDEFINED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (this->m_available == TOUCHID_AVAILABLE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,6 +269,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->m_available = TOUCHID_NOT_AVAILABLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -294,7 +300,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ policyCode = LAPolicyDeviceOwnerAuthenticationWithBiometricsOrWatch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101201
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ policyCode = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>