From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C1C2138335 for ; Wed, 20 Mar 2019 11:01:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58FD9E08F7; Wed, 20 Mar 2019 11:01:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FA39E08F7 for ; Wed, 20 Mar 2019 11:01:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64DFD335CC8 for ; Wed, 20 Mar 2019 11:01:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D7644E3 for ; Wed, 20 Mar 2019 11:01:54 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1553079708.0012625aa824c6f970d272b2fb6b67c282d2257b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepassxc/Manifest app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch app-admin/keepassxc/keepassxc-2.4.0.ebuild app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild X-VCS-Directories: app-admin/keepassxc/ app-admin/keepassxc/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0012625aa824c6f970d272b2fb6b67c282d2257b X-VCS-Branch: master Date: Wed, 20 Mar 2019 11:01:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 58051503-8e9c-45ca-954c-8baa4e76a5e3 X-Archives-Hash: c140a7e541c1b658568bd80a8193c468 commit: 0012625aa824c6f970d272b2fb6b67c282d2257b Author: Lars Wendler gentoo org> AuthorDate: Wed Mar 20 11:00:39 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Mar 20 11:01:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0012625a app-admin/keepassxc: Bump to version 2.4.0. Removed old. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/Manifest | 2 +- .../files/keepassxc-2.4.0-build_fix.patch | 38 ++++++++++++++++++++++ ...c-2.4.0_beta2.ebuild => keepassxc-2.4.0.ebuild} | 8 ++--- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index a434365f41e..3cc0130cc13 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,2 +1,2 @@ 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.tar.gz 4790634 BLAKE2B 5298baf80c48f27da16274f815dc6d83031586e3fec20356569c4d7eb652ed68f22b849595c837e736b7b3adb7636bf1f50c89626a093eecf236e3a94d89f33b SHA512 a50e90389bb53ffca28d322958c01db09472bf5e3d21075ab09db7cc1ed2e8aa0ac9ff310d79c06da4f429aef0427e3706931ce5d4d02b54a52b0209ba5ab853 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 00000000000..486c8e2dd9a --- /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 +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 similarity index 87% rename from app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild rename to app-admin/keepassxc/keepassxc-2.4.0.ebuild index 4d05c7804c8..7329f7db6fb 100644 --- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild +++ b/app-admin/keepassxc/keepassxc-2.4.0.ebuild @@ -13,8 +13,8 @@ if [[ "${PV}" != 9999 ]] ; 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" + 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" fi else @@ -59,6 +59,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-dont_call_mandb.patch" + "${FILESDIR}/${P}-build_fix.patch" ) src_prepare() { @@ -74,12 +75,11 @@ 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)" ) - if [[ "${PV}" == *_beta* ]] ; then + if [[ "${PV}" != 9999 ]] ; then mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) fi cmake-utils_src_configure