[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/
commit: c0bddfdde69a218af2b9da404f757d263d40743a Author: Maciej Barć gentoo org> AuthorDate: Thu Jun 20 11:54:28 2024 + Commit: Maciej Barć gentoo org> CommitDate: Thu Jun 20 14:05:27 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bddfdd app-admin/keepassxc: bump to 2.7.9 Signed-off-by: Maciej Barć gentoo.org> app-admin/keepassxc/Manifest | 1 + .../keepassxc/files/keepassxc-2.7.9-tests.patch| 12 +++ app-admin/keepassxc/keepassxc-2.7.9.ebuild | 113 + 3 files changed, 126 insertions(+) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index c195d9b9bc76..ea5f82e43830 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1 +1,2 @@ DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04 SHA512 c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a +DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa SHA512 255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4 diff --git a/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch new file mode 100644 index ..153b3c721018 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch @@ -0,0 +1,12 @@ +--- a/tests/CMakeLists.txt b/tests/CMakeLists.txt +@@ -246,9 +246,6 @@ if(WITH_XC_NETWORKING OR WITH_XC_BROWSER) + add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES}) + endif() + +-add_unit_test(NAME testcli SOURCES TestCli.cpp +-LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES}) +-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$") + + if(WITH_GUI_TESTS) + add_subdirectory(gui) diff --git a/app-admin/keepassxc/keepassxc-2.7.9.ebuild b/app-admin/keepassxc/keepassxc-2.7.9.ebuild new file mode 100644 index ..fe31c46f4f47 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.9.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org/ + https://github.com/keepassxreboot/keepassxc/; + +if [[ "${PV}" = ** ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}; +else + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz; + fi + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="X autotype browser doc keeshare +network test yubikey" + +RESTRICT="!test? ( test )" +REQUIRED_USE="autotype? ( X )" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/botan:3= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/qrencode:= + sys-libs/readline:0= + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) + autotype? ( + x11-libs/libX11 + x11-libs/libXtst + ) + yubikey? ( + dev-libs/libusb:1 + sys-apps/pcsc-lite + ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qttest:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 + doc? ( + dev-ruby/asciidoctor + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.7.9-tests.patch" +) + +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f .version ]] ; then + printf '%s' "${PV}" > .version || die + fi + + cmake_src_prepare +} + +src_configure() { + # https://github.com/keepassxreboot/keepassxc/issues/5801 + filter-lto + + local -a mycmakeargs=( + # Gentoo users enable ccache via e.g. FEATURES=ccache or + # other means. We don't want the build system to enable it for us. + -DWITH_CCACHE=OFF + -DWITH_GUI_TESTS=OFF + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_DOCS="$(usex doc)" +
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/
commit: afc96be9d10e99425d691519c757fed0987bc2d6 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon May 22 17:13:52 2023 + Commit: Maciej Barć gentoo org> CommitDate: Mon May 22 17:38:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc96be9 app-admin/keepassxc: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31131 Signed-off-by: Maciej Barć gentoo.org> app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch | 14 -- 1 file changed, 14 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch deleted file mode 100644 index 52ca2b7eb610.. --- a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 776c40d9..477bf179 100644 a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER) - LIBS ${TEST_LIBRARIES}) - endif() - --add_unit_test(NAME testcli SOURCES TestCli.cpp --LIBS testsupport cli ${TEST_LIBRARIES}) -- - if(WITH_GUI_TESTS) - add_subdirectory(gui) - endif(WITH_GUI_TESTS)
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/
commit: f4f777ec8fed602312d50a185be63749aa6c6a8a Author: Lars Wendler gentoo org> AuthorDate: Tue Sep 28 17:35:35 2021 + Commit: Lars Wendler gentoo org> CommitDate: Tue Sep 28 17:48:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f777ec app-admin/keepassxc: Removed old Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/Manifest | 2 - .../keepassxc/files/keepassxc-2.6.4-quazip1.patch | 28 --- app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild | 95 - app-admin/keepassxc/keepassxc-2.6.5.ebuild | 98 -- 4 files changed, 223 deletions(-) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 46a0d186df9..bdde1c3d9cb 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,3 +1 @@ -DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb -DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a SHA512 a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7 diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch deleted file mode 100644 index 42f4fe7478b..000 --- a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efbb6fc9da02fed4e5db21858aa7d265081df2c8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Mon, 5 Oct 2020 21:00:24 +0200 -Subject: [PATCH] Support quazip 1.0 - - cmake/FindQuaZip.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake -index a387e2f81..9fab3e579 100644 a/cmake/FindQuaZip.cmake -+++ b/cmake/FindQuaZip.cmake -@@ -10,12 +10,12 @@ if(MINGW) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h) - else() - find_library(QUAZIP_LIBRARIES --NAMES quazip5 quazip -+NAMES quazip5 quazip quazip1-qt5 - PATHS /usr/lib /usr/lib64 /usr/local/lib - ) - find_path(QUAZIP_INCLUDE_DIR quazip.h - PATHS /usr/include /usr/local/include --PATH_SUFFIXES quazip5 quazip -+PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip - ) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) - endif() diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild deleted file mode 100644 index e15340b8174..000 --- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org; - -if [[ "${PV}" != ]] ; then - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz; - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}; -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser ccache keeshare +network test yubikey" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/qrencode:= - sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - keeshare? ( dev-libs/quazip:0= ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} -
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/
commit: 688026fef945d2f6bd310c363a24f33d0cafaf94 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 20 18:55:00 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 23 19:52:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688026fe app-admin/keepassxc: Support build with >=dev-libs/quazip-1.0 See also: https://github.com/keepassxreboot/keepassxc/pull/5511 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../keepassxc/files/keepassxc-2.6.4-quazip1.patch | 28 ++ ...assxc-.ebuild => keepassxc-2.6.4-r2.ebuild} | 6 +++-- app-admin/keepassxc/keepassxc-.ebuild | 6 +++-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch new file mode 100644 index 000..42f4fe7478b --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch @@ -0,0 +1,28 @@ +From efbb6fc9da02fed4e5db21858aa7d265081df2c8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Mon, 5 Oct 2020 21:00:24 +0200 +Subject: [PATCH] Support quazip 1.0 + +--- + cmake/FindQuaZip.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake +index a387e2f81..9fab3e579 100644 +--- a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake +@@ -10,12 +10,12 @@ if(MINGW) + find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h) + else() + find_library(QUAZIP_LIBRARIES +-NAMES quazip5 quazip ++NAMES quazip5 quazip quazip1-qt5 + PATHS /usr/lib /usr/lib64 /usr/local/lib + ) + find_path(QUAZIP_INCLUDE_DIR quazip.h + PATHS /usr/include /usr/local/include +-PATH_SUFFIXES quazip5 quazip ++PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip + ) + find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) + endif() diff --git a/app-admin/keepassxc/keepassxc-.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild similarity index 95% copy from app-admin/keepassxc/keepassxc-.ebuild copy to app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild index 10b1cb7ce9d..6ea4ff699bb 100644 --- a/app-admin/keepassxc/keepassxc-.ebuild +++ b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild @@ -26,6 +26,8 @@ LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" IUSE="autotype browser ccache keeshare +network test yubikey" +RESTRICT="!test? ( test )" + RDEPEND=" app-crypt/argon2:= dev-libs/libgcrypt:= @@ -46,7 +48,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0 ) + keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) " @@ -59,7 +61,7 @@ BDEPEND=" ccache? ( dev-util/ccache ) " -RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) # pending upstream PR#5511 src_prepare() { use test || \ diff --git a/app-admin/keepassxc/keepassxc-.ebuild b/app-admin/keepassxc/keepassxc-.ebuild index 10b1cb7ce9d..df01dad6f39 100644 --- a/app-admin/keepassxc/keepassxc-.ebuild +++ b/app-admin/keepassxc/keepassxc-.ebuild @@ -26,6 +26,8 @@ LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" IUSE="autotype browser ccache keeshare +network test yubikey" +RESTRICT="!test? ( test )" + RDEPEND=" app-crypt/argon2:= dev-libs/libgcrypt:= @@ -46,7 +48,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0 ) + keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) " @@ -59,7 +61,7 @@ BDEPEND=" ccache? ( dev-util/ccache ) " -RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}"/${PN}-2.6.4-quazip1.patch ) # pending upstream PR#5511 src_prepare() { use test || \
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/
commit: f2db0691e4f7f26ba25603013e32fa1fb68dbf0f Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 8 08:10:52 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 8 08:11:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2db0691 app-admin/keepassxc: Make ccache usage optional Closes: https://bugs.gentoo.org/704560 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> .../files/keepassxc-2.5.2-ccache_switch.patch | 59 ++ app-admin/keepassxc/keepassxc-2.5.1.ebuild | 25 - app-admin/keepassxc/keepassxc-2.5.2.ebuild | 11 +++- app-admin/keepassxc/keepassxc-.ebuild | 7 ++- app-admin/keepassxc/metadata.xml | 1 + 5 files changed, 84 insertions(+), 19 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch new file mode 100644 index 000..57d8b3d714c --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch @@ -0,0 +1,59 @@ +From ae471bea14c8e05bcf368168649399b116a69992 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Tue, 7 Jan 2020 17:44:08 -0500 +Subject: [PATCH] CMakeLists.txt: Do not unconditionally use ccache + +This causes build failures in Gentoo because we don't allow access to ccache files if ccache is not enabled for build. + +Fix this by adding a WITH_CCACHE cmake option and change behavior so that cmake fails if WITH_CCACHE is enabled but ccache program cannot be found. + +Gentoo-bug: https://bugs.gentoo.org/704560 +Signed-off-by: Lars Wendler +--- + CMakeLists.txt | 19 --- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2f9b5bfe..1c5746c59 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -27,13 +27,6 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +-# Use the Compiler Cache (ccache) if it is installed +-# (install with: sudo apt get ccache) +-find_program (CCACHE_FOUND ccache) +-if (CCACHE_FOUND) +-set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +-endif (CCACHE_FOUND) +- + # Support Visual Studio Code + include(CMakeToolsHelpers OPTIONAL) + include(FeatureSummary) +@@ -48,6 +41,7 @@ option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated + option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF) + option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF) + option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON) ++option(WITH_CCACHE "Use ccache for build" OFF) + + set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins") + +@@ -65,6 +59,17 @@ if(APPLE) + option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF) + endif() + ++if(WITH_CCACHE) ++# Use the Compiler Cache (ccache) program ++# (install with: sudo apt get ccache) ++find_program (CCACHE_FOUND ccache) ++if(CCACHE_FOUND) ++set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) ++else() ++message(FATAL_ERROR "ccache requested but cannot be found.") ++endif() ++endif() ++ + if(WITH_XC_ALL) + # Enable all options (except update check) + set(WITH_XC_AUTOTYPE ON) diff --git a/app-admin/keepassxc/keepassxc-2.5.1.ebuild b/app-admin/keepassxc/keepassxc-2.5.1.ebuild index 344be63f074..c3a08042f8f 100644 --- a/app-admin/keepassxc/keepassxc-2.5.1.ebuild +++ b/app-admin/keepassxc/keepassxc-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser debug keeshare +network test yubikey" +IUSE="autotype browser ccache debug keeshare +network test yubikey" RDEPEND=" app-crypt/argon2:= @@ -55,7 +55,9 @@ DEPEND=" dev-qt/linguist-tools:5 dev-qt/qttest:5 " - +BDEPEND=" + ccache? ( dev-util/ccache ) +" # Not a runtime dependency but still needed (see bug #667092) PDEPEND=" x11-misc/xsel @@ -63,6 +65,10 @@ PDEPEND=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/${PN}-2.5.2-ccache_switch.patch" +) + src_prepare() { use test || \ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die @@ -72,6 +78,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DWITH_CCACHE="$(usex ccache)" -DWITH_GUI_TESTS=OFF -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" @@ -88,15 +95,3 @@ src_configure() { fi cmake_src_configure } - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} -
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/
commit: 9b684a6fabbdbc13915fd8956543ca240e332905 Author: Lars Wendler gentoo org> AuthorDate: Mon Sep 9 07:08:02 2019 + Commit: Lars Wendler gentoo org> CommitDate: Mon Sep 9 07:08:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b684a6f app-admin/keepassxc: Removed old Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/Manifest | 1 - ...-2.3.3-qt-5.11-edit-entry-widget-includes.patch | 10 --- .../files/keepassxc-dont_call_mandb.patch | 25 -- app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild | 91 -- 4 files changed, 127 deletions(-) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 154c918fd6d..62cd089d020 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,2 +1 @@ -DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c4cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d diff --git a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch deleted file mode 100644 index c382db5873f..000 --- a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ a/src/gui/entry/EditEntryWidget.cpp -+++ b/src/gui/entry/EditEntryWidget.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "autotype/AutoType.h" - #include "core/Config.h" diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch deleted file mode 100644 index a3ff5f7244d..000 --- a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7789bed0f29e0067eca7a40f604262d18611cdb0 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Fri, 8 Mar 2019 14:48:13 +0100 -Subject: [PATCH] Don't call mandb - -There are other man implementations beside man-db so it is not even sure -that the "mandb" binary even exists on all unices. Other than that, usually -there's a cron job running "mandb" on a daily basis. - src/cli/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt -index e59a911a..c3f97a2c 100644 a/src/cli/CMakeLists.txt -+++ b/src/cli/CMakeLists.txt -@@ -94,5 +94,4 @@ endif() - - if(APPLE OR UNIX) - install(FILES keepassxc-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) --execute_process(COMMAND mandb -q) - endif() --- -2.21.0 - diff --git a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild deleted file mode 100644 index 742ca5d1e1b..000 --- a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org; - -if [[ "${PV}" != ]] ; then - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz; - KEYWORDS="amd64 x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}; -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser debug network test yubikey" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - browser? ( >=dev-libs/libsodium-1.0.12 ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - dev-qt/qtconcurrent:5 -" - -# Not a runtime dependency but still needed (see bug #667092) -PDEPEND=" - x11-misc/xsel -" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844 - "${FILESDIR}/${PN}-dont_call_mandb.patch" -) -
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/
commit: 249cae16c7249498d39444376f8f057fff721f74 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 11 18:38:07 2019 + Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 11 18:38:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249cae16 app-admin/keepassxc: Fixed incomplete patch Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> .../files/keepassxc-2.4.0-update_checker_toggle.patch | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch index bca65f3b4ae..64e02066916 100644 --- a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch +++ b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch @@ -1,4 +1,4 @@ -From 64fe9de385be43212a83c0c89791a95af203eef9 Mon Sep 17 00:00:00 2001 +From 28994fef0d2c04690490f34b5da87c42e60a6b5e Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 9 Apr 2019 21:06:13 -0400 Subject: [PATCH] Enhance update checker @@ -14,13 +14,13 @@ Subject: [PATCH] Enhance update checker src/config-keepassx.h.cmake | 1 + src/core/Clock.cpp | 1 + src/gui/ApplicationSettingsWidget.cpp | 25 ++- - src/gui/ApplicationSettingsWidget.h | 1 + + src/gui/ApplicationSettingsWidget.h | 2 + src/gui/ApplicationSettingsWidgetGeneral.ui | 39 +++--- src/gui/MainWindow.cpp | 12 ++-- src/updatecheck/UpdateChecker.cpp | 79 + src/updatecheck/UpdateChecker.h | 2 +- tests/TestUpdateCheck.cpp | 35 ++--- - 11 files changed, 146 insertions(+), 55 deletions(-) + 11 files changed, 147 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 658548f7..4f8a419c 100644 @@ -123,13 +123,14 @@ index 90b851bd..e6a7068d 100644 +m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked); +} diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h -index ffcfea2b..8cdc7ed7 100644 +index ffcfea2b..86688b70 100644 --- a/src/gui/ApplicationSettingsWidget.h +++ b/src/gui/ApplicationSettingsWidget.h -@@ -56,6 +56,7 @@ private slots: +@@ -56,6 +56,8 @@ private slots: void autoSaveToggled(bool checked); void systrayToggled(bool checked); void enableToolbarSettings(bool checked); ++void rememberDatabasesToggled(bool checked); +void checkUpdatesToggled(bool checked); private:
[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/
commit: 84303d0123679297d07ea6abeef31155dd1ff5ec Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 8 13:59:05 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 8 13:59:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84303d01 app-admin/keepassxc: Fixed typo in comment. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch index f966ae5ff28..a3ff5f7244d 100644 --- a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch +++ b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch @@ -1,9 +1,9 @@ -From f3e52d89b20a8740d18cd9f1124f299b64f06b36 Mon Sep 17 00:00:00 2001 +From 7789bed0f29e0067eca7a40f604262d18611cdb0 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 8 Mar 2019 14:48:13 +0100 Subject: [PATCH] Don't call mandb -There are other man implementateions beside man-db so it is not even sure +There are other man implementations beside man-db so it is not even sure that the "mandb" binary even exists on all unices. Other than that, usually there's a cron job running "mandb" on a daily basis. ---