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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB21B158020 for ; Mon, 26 Dec 2022 07:03:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE834E096B; Mon, 26 Dec 2022 07:03:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B21EAE096B for ; Mon, 26 Dec 2022 07:03:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85A04341174 for ; Mon, 26 Dec 2022 07:03:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C07796F2 for ; Mon, 26 Dec 2022 07:03:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672038192.4c8f2d16fe7ca3b878db262dc1f5749d4e548023.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/gnucash/gnucash-4.12-r1.ebuild app-office/gnucash/gnucash-4.12.ebuild X-VCS-Directories: app-office/gnucash/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4c8f2d16fe7ca3b878db262dc1f5749d4e548023 X-VCS-Branch: master Date: Mon, 26 Dec 2022 07:03:44 +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: c5f3e527-207d-4977-93ef-95c3faa4410c X-Archives-Hash: 4dfac2540dbd88cf5163c24a040fbbc8 commit: 4c8f2d16fe7ca3b878db262dc1f5749d4e548023 Author: Marco Scardovi icloud com> AuthorDate: Mon Dec 19 22:30:53 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 26 07:03:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8f2d16 app-office/gnucash: revbump, add unconditional gtest dep, fix bug 884755 Gnucash team adds gtest as unconditional dep. We are gonna respect this requirement, adding it too. See: https://bugs.gnucash.org/show_bug.cgi?id=795250 Closes: https://bugs.gentoo.org/884755 Signed-off-by: Marco Scardovi icloud.com> Signed-off-by: Sam James gentoo.org> ...{gnucash-4.12.ebuild => gnucash-4.12-r1.ebuild} | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/app-office/gnucash/gnucash-4.12.ebuild b/app-office/gnucash/gnucash-4.12-r1.ebuild similarity index 88% rename from app-office/gnucash/gnucash-4.12.ebuild rename to app-office/gnucash/gnucash-4.12-r1.ebuild index 702eadfdd4b6..071a22d369b0 100644 --- a/app-office/gnucash/gnucash-4.12.ebuild +++ b/app-office/gnucash/gnucash-4.12-r1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] - sys-libs/gwenhywfar:= + >=sys-libs/gwenhywfar-4.20.0:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) @@ -54,7 +54,7 @@ RDEPEND=" dev-db/libdbi dev-db/libdbi-drivers[mysql] ) - ofx? ( >=dev-libs/libofx-0.9.1:= ) + ofx? ( >=dev-libs/libofx-0.9.12:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] @@ -75,17 +75,20 @@ RDEPEND=" dev-db/libdbi-drivers[sqlite] ) " + +# gtest is a required dep +# see https://bugs.gnucash.org/show_bug.cgi?id=795250 DEPEND=" ${RDEPEND} >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool - test? ( >=dev-cpp/gtest-1.8.0 ) + >=dev-cpp/gtest-1.8.0 " BDEPEND=" dev-lang/swig - dev-util/cmake + >=dev-util/cmake-3.10 virtual/pkgconfig " PDEPEND=" @@ -96,12 +99,12 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.8-examples-subdir.patch - "${FILESDIR}"/${PN}-3.8-exclude-license.patch - "${FILESDIR}"/${P}-drop-broken-test.patch + "${FILESDIR}/${PN}-3.8-examples-subdir.patch" + "${FILESDIR}/${PN}-3.8-exclude-license.patch" + "${FILESDIR}/${P}-drop-broken-test.patch" # will be fixed on future version, see # https://github.com/Gnucash/gnucash/pull/1472 - "${FILESDIR}"/${P}-fix-test.patch + "${FILESDIR}/${P}-fix-test.patch" ) # guile generates ELF files without use of C or machine code @@ -134,7 +137,7 @@ src_prepare() { libgnucash/backend/xml/test/test-xml-pricedb.cpp ) for x in "${fixtestfiles[@]}"; do - sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed" + sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed" done } @@ -208,11 +211,6 @@ pkg_postinst() { fi xdg_desktop_database_update xdg_mimeinfo_database_update - - ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!" - ewarn - ewarn "GnuCash 2.7.0 introduced large changes in its file format and database" - ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6." } pkg_postrm() {