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 9FC1B1382C5 for ; Sun, 18 Feb 2018 12:32:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6B45E0C5A; Sun, 18 Feb 2018 12:31:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 96235E0C5A for ; Sun, 18 Feb 2018 12:31:59 +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 1E798335C2E for ; Sun, 18 Feb 2018 12:31:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68C50211 for ; Sun, 18 Feb 2018 12:31:56 +0000 (UTC) From: "Aaron Swenson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" Message-ID: <1518957104.abd6bba4c31bb6e546bb8e1da37fa971ffa55746.titanofold@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/, app-office/gnucash/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/gnucash/files/gnucash-2.7.4-double_free.patch app-office/gnucash/gnucash-2.7.4-r1.ebuild X-VCS-Directories: app-office/gnucash/files/ app-office/gnucash/ X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron Swenson X-VCS-Revision: abd6bba4c31bb6e546bb8e1da37fa971ffa55746 X-VCS-Branch: master Date: Sun, 18 Feb 2018 12:31:56 +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-Archives-Salt: 6ad36609-6f93-4e02-8a57-c6565453ccf4 X-Archives-Hash: 08968562932cc16cea6b55de71037d45 commit: abd6bba4c31bb6e546bb8e1da37fa971ffa55746 Author: Aaron W. Swenson gentoo org> AuthorDate: Sun Feb 18 12:31:26 2018 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Sun Feb 18 12:31:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd6bba4 app-office/gnucash: Fix 2.7.4 test failures Fix a double-free bug in test-userdata-dir.c. Copy over common/test-core/unittest_support.py to the BUILDDIR so that it can be sourced by the python-bindings test. Set XDG_DATA_HOME so that it’s pointing to the same place as TMPDIR. Not fixed: Locale dependent tests. /etc/locale.gen needs the following: en_GB.UTF-8 UTF-8 en_US.UTF-8 UTF-8 fr_FR.UTF-8 UTF-8 Bug: https://bugs.gentoo.org/647596 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../gnucash/files/gnucash-2.7.4-double_free.patch | 12 ++ app-office/gnucash/gnucash-2.7.4-r1.ebuild | 162 +++++++++++++++++++++ 2 files changed, 174 insertions(+) diff --git a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch new file mode 100644 index 00000000000..9d82e72f96b --- /dev/null +++ b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch @@ -0,0 +1,12 @@ +diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c +index 5a8cd5c50..a702a56aa 100644 +--- a/libgnucash/core-utils/test/test-userdata-dir.c ++++ b/libgnucash/core-utils/test/test-userdata-dir.c +@@ -338,7 +338,6 @@ main(int argc, char **argv) + + /* Clean up the temporaries that were created for the GNC_DATA_HOME test run */ + g_free (home_dir); +- g_free (tmp_dir); + tmp_dir = g_build_filename(gnc_data_home_dir, "data", (gchar *)NULL); + g_rmdir (tmp_dir); + g_free (tmp_dir); diff --git a/app-office/gnucash/gnucash-2.7.4-r1.ebuild b/app-office/gnucash/gnucash-2.7.4-r1.ebuild new file mode 100644 index 00000000000..453271a8061 --- /dev/null +++ b/app-office/gnucash/gnucash-2.7.4-r1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# google{test,mock} version +GV="1.8.0" +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils gnome2-utils python-single-r1 xdg-utils + +DESCRIPTION="A personal finance manager" +HOMEPAGE="http://www.gnucash.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 + https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +# Add doc back in for 3.0 and bump app-doc/gnucash-docs +IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres + python quotes -register2 sqlite" +REQUIRED_USE=" + chipcard? ( aqbanking ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# libdbi version requirement for sqlite taken from bug #455134 +# +# dev-libs/boost must always be built with nls enabled. +RDEPEND=" + >=dev-libs/glib-2.40.0:2 + >=dev-libs/libxml2-2.7.0:2 + >=dev-scheme/guile-2.0.0:12=[regex] + >=sys-libs/zlib-1.1.4 + >=x11-libs/gtk+-3.14.0:3 + dev-libs/boost:=[icu,nls] + dev-libs/icu:= + dev-libs/libxslt + gnome-base/dconf + net-libs/webkit-gtk:4= + aqbanking? ( + >=net-libs/aqbanking-5[gtk,ofx?] + sys-libs/gwenhywfar[gtk] + chipcard? ( sys-libs/libchipcard ) + ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) + mysql? ( + dev-db/libdbi + dev-db/libdbi-drivers[mysql] + ) + ofx? ( >=dev-libs/libofx-0.9.1 ) + postgres? ( + dev-db/libdbi + dev-db/libdbi-drivers[postgres] + ) + python? ( ${PYTHON_DEPS} ) + quotes? ( + >=dev-perl/Finance-Quote-1.11 + dev-perl/Date-Manip + dev-perl/HTML-TableExtract + ) + sqlite? ( + >=dev-db/libdbi-0.9.0 + >=dev-db/libdbi-drivers-0.9.0[sqlite] + ) +" + +DEPEND="${RDEPEND} + ~dev-cpp/gtest-${GV} + dev-lang/perl + dev-perl/XML-Parser + dev-util/intltool + gnome-base/gnome-common + sys-devel/libtool + virtual/pkgconfig +" + +# Uncomment for 3.0 +# PDEPEND="doc? ( +# ~app-doc/gnucash-docs-${PV} +# gnome-extra/yelp +# )" + +PATCHES=( "${FILESDIR}"/gnucash-2.7.4-double_free.patch ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + xdg_environment_reset +} + +src_configure() { + local sql_on_off="OFF" + if use mysql || use postgres || use sqlite ; then + sql_on_off="ON" + fi + + local mycmakeargs=( + -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock + -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest + + -DDISABLE_NLS=$(usex !nls) + -DENABLE_REGISTER2=$(usex register2) + -DWITH_AQBANKING=$(usex aqbanking) + -DWITH_OFX=$(usex ofx) + -DWITH_PYTHON=$(usex python) + -DWITH_SQL=${sql_on_off} + ) + + cmake-utils_src_configure +} + +src_test() { + if use python ; then + cp common/test-core/unittest_support.py \ + "${BUILD_DIR}"/common/test-core/ || die + fi + + cd "${BUILD_DIR}" || die + XDG_DATA_HOME="${T}/$(whoami)" emake check +} + +src_install() { + cmake-utils_src_install + + rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die + rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + + if use examples ; then + mv "${ED%/}"/usr/share/doc/gnucash \ + "${ED%/}"/usr/share/doc/${PF}/examples || die + pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die + rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \ + *win32-bin.txt || die + popd > /dev/null || die + docompress -x /usr/share/doc/${PF}/examples/ + else + rm -r "${ED%/}"/usr/share/doc/gnucash || die + fi + + use aqbanking && dodoc doc/README.HBCI + use ofx && dodoc doc/README.OFX +} + +pkg_postinst() { + gnome2_icon_cache_update + gnome2_schemas_update + 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() { + gnome2_icon_cache_update + gnome2_schemas_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +}