diff options
Diffstat (limited to 'app-admin/keepassxc')
| -rw-r--r-- | app-admin/keepassxc/Manifest | 7 | ||||
| -rw-r--r-- | app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch | 38 | ||||
| -rw-r--r-- | app-admin/keepassxc/keepassxc-2.4.0.ebuild (renamed from app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild) | 4 | ||||
| -rw-r--r-- | app-admin/keepassxc/keepassxc-9999.ebuild | 3 |
4 files changed, 47 insertions, 5 deletions
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 74db5c3b08e0..03bf85d0bf9c 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,8 +1,9 @@ AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9 +AUX keepassxc-2.4.0-build_fix.patch 1419 BLAKE2B b5661c75008c9031598ee704b21e0581a6e3859addb9b4e642cca415b06f26cb7e6a984fb942f648f7d4082c17e198644230ddf711696971df6754cf4c6eb119 SHA512 3e659b5048089528c2055f9481119e66f655b2531a4347d4ca6e439bcc82566f2e658bdf4442e6c678d19811ca494533e7ce08e14dab3148c841084f2f5ab898 AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8 -DIST keepassxc-2.4.0_beta2.tar.gz 4740311 BLAKE2B 071edbf9d985671d70c381bd4863a704af6ad172a22fcf23ee0e12c8ea2a723029626669ed37e2e2739e3a66106b00b4c73cdbaa8e43496d950363422d6df8cc SHA512 5db8eb11a6aa42632bf2642af121063cb0df32fa1cda1beaea7c18e07c65049d3fa9a1a76643bd97ded80b7e5b2d403e9cd414c808faffdf2cb7e75c7f0578b1 +DIST keepassxc-2.4.0-src.tar.xz 3252104 BLAKE2B 7c82822f6fb0eaf6b5d086aebdf4927af215339f92e7f52104e05d5ff301461a1ad816d8a39b377c717e975001c9295ec6d8b2f2003a2215c05931eb9acb5c73 SHA512 b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f -EBUILD keepassxc-2.4.0_beta2.ebuild 2034 BLAKE2B 490e10dc028abf7611b4b6d40a785883547d3c79bc6c7e4c12b228764f18fe6b1c3f6f5060318aad1f14a9b24f78dca6e7b3ebc37e0143697a404e3697b1b09a SHA512 200892601ad3c51c8b29aff2970dbc2e922e4a246e3e7176d2d5ef0ca52dc8fd650dc1809b666b31837081652f30e56493dc0087588bb42308659fa07956b1b2 -EBUILD keepassxc-9999.ebuild 1978 BLAKE2B 12c28125986700c0e190b07d689d48da7846d6106fb5866e49196902edb52d5fb94736bee4ce867994d3865fecbe6f5895359b0daf50337f719fb1cd9b08037d SHA512 6b05af40e41c9a73b99448a425071ec1bf013a3b1568b0ad744c16baddad15adb56e7fa243442200839d853d4b7762920b92f69c4cfcad95b7f63740d6b2dc4b +EBUILD keepassxc-2.4.0.ebuild 2087 BLAKE2B 95aa54e8b74d315affb3300c0384faeea4861b79fdf52037c15b1c2beb3da15a9de9bd58f70debdd21f3bd5417ccadb5b8d001787a253f482c6e0edae58afd68 SHA512 9e97dbc7d7182a3d1ad53de47403baf7b0026271241e936d60039238869faf0b6b48fe1d463f2effb45498d822067352e2bc238efaad4260e1996ec9ac9750fd +EBUILD keepassxc-9999.ebuild 1995 BLAKE2B 6b883c1cc942e330d437707367e9e6e416432ac5c932360fb561eac3ff4af72e70b50ea58084aad0082255d0f1528168e96ac8e9faff96fcea8814760f4893c8 SHA512 75d6f738836de30ace55d71c8d69b0bb4837542be721fb4663bfaef595f1b0d7c8d15bf1211549c2219f98ec45c49e2ddec772956d0347a470dd3ef55b8b5bd1 MISC metadata.xml 891 BLAKE2B 0c279d26b8f00d816d92a8fdd428629cf92a0ee7c0789ac60c9b5ea9b491dbd495a09815785fa99427ae8f5701dff0da8a06065059b1a6f05f1cdadbdde88192 SHA512 ec6fe12b1b508784947b55bb562a9e99632481ce06289b4dd7325f0834789fa4df99a15792ab7e91bab169c89a0a5a4c99ccd3372f1a2ff84cece49c4acd1779 diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch new file mode 100644 index 000000000000..486c8e2dd9a3 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch @@ -0,0 +1,38 @@ +From ff43f3ff8a8a1630d10e7117c45048623d215616 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Wed, 20 Mar 2019 11:53:21 +0100 +Subject: [PATCH] src/gui/DatabaseWidget.cpp: Build fails without + WITH_XC_KEESHARE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp: In member function ‘void DatabaseWidget::search(const QString&)’: +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: error: ‘m_shareLabel’ was not declared in this scope + m_shareLabel->setVisible(false); + ^~~~~~~~~~~~ +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: note: suggested alternative: ‘m_searchingLabel’ + m_shareLabel->setVisible(false); + ^~~~~~~~~~~~ + m_searchingLabel +--- + src/gui/DatabaseWidget.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp +index 8728c331..e4196734 100644 +--- a/src/gui/DatabaseWidget.cpp ++++ b/src/gui/DatabaseWidget.cpp +@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QString& searchtext) + } + + m_searchingLabel->setVisible(true); ++#ifdef WITH_XC_KEESHARE + m_shareLabel->setVisible(false); ++#endif + + emit searchModeActivated(); + } +-- +2.21.0 + diff --git a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild b/app-admin/keepassxc/keepassxc-2.4.0.ebuild index 4d05c7804c81..fc5f6889a735 100644 --- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild +++ b/app-admin/keepassxc/keepassxc-2.4.0.ebuild @@ -33,7 +33,9 @@ RDEPEND=" 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/zlib autotype? ( dev-qt/qtx11extras:5 @@ -59,6 +61,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-dont_call_mandb.patch" + "${FILESDIR}/${P}-build_fix.patch" ) src_prepare() { @@ -74,7 +77,6 @@ src_configure() { -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_HTTP=OFF -DWITH_XC_NETWORKING="$(usex network)" -DWITH_XC_SSHAGENT=ON -DWITH_XC_YUBIKEY="$(usex yubikey)" diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index b59c1684db72..4aa8f179e8b7 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -33,7 +33,9 @@ RDEPEND=" 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/zlib autotype? ( dev-qt/qtx11extras:5 @@ -70,7 +72,6 @@ src_configure() { -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_HTTP=OFF -DWITH_XC_NETWORKING="$(usex network)" -DWITH_XC_SSHAGENT=ON -DWITH_XC_YUBIKEY="$(usex yubikey)" |