diff options
Diffstat (limited to 'app-office/gnucash')
| -rw-r--r-- | app-office/gnucash/Manifest | 8 | ||||
| -rw-r--r-- | app-office/gnucash/files/gnucash-5.10-swig-4.3.patch | 59 | ||||
| -rw-r--r-- | app-office/gnucash/files/gnucash-5.11-boost-1.88.patch | 58 | ||||
| -rw-r--r-- | app-office/gnucash/gnucash-5.10-r1.ebuild (renamed from app-office/gnucash/gnucash-5.10.ebuild) | 44 | ||||
| -rw-r--r-- | app-office/gnucash/gnucash-5.11.ebuild (renamed from app-office/gnucash/gnucash-5.8-r100.ebuild) | 55 |
5 files changed, 164 insertions, 60 deletions
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest index e7771231026b..652c1c696e66 100644 --- a/app-office/gnucash/Manifest +++ b/app-office/gnucash/Manifest @@ -2,12 +2,14 @@ AUX gnucash-4.12-drop-broken-test.patch 1214 BLAKE2B 6e977f65cecee6b910288152979 AUX gnucash-5.0-exclude-license.patch 790 BLAKE2B e3f251d47b965f0071efc36bf6a399d1f0269ff02506635195b61760f8a99b9599c4bdeadda3204a344ca0493290ca8a0bb3b726f425cd084b830e0f4328167b SHA512 97fd15413759447857a51fddfec4f52e716017d585882d56acec195672f999687f33eb8276091f2fa43060d129c6a8171e1678a7b511a31cf441aab28e083c33 AUX gnucash-5.0-webkit2gtk-4.1.patch 484 BLAKE2B 075c06765edbd6f0d7e50c033813b587c145e882372efb2b10cd63fc0ec555ee7a4ec048d89e96208fb117a4b4cde22e7a6a2b36c5fa247e6bde1edc50ad59f7 SHA512 37df788a64c91ac30667d1d92f0a017883314968cd77aace7b43654232e140dd5e00a4044d9c63437df4d1d50ebbe665f6a65189734c02c0fa224dd7076364bf AUX gnucash-5.10-import-qif.patch 1302 BLAKE2B eae4e46f92e6e249f4742e3eedd9649b209203d75190a8e8091f5de7231324c28a316bf31a5d6c973b66b2781973bfa1f70af2ef0f0da22742ab69dc51e0fb05 SHA512 e433a0b3aad3fd82becf96a838fba6d6c6fa6cbbfa731cdbcaf841bf06876c466d3975d3e431a6391ea973d7f23ff6f4541e09f757e2aa879bf67d7ee4ee3178 +AUX gnucash-5.10-swig-4.3.patch 2195 BLAKE2B 95307f1105d780324b9ff15f137c2dd917eabc74630a8ab0b70efe60e3463ac3eae0e57f6e6144680d1251a82ff643261316902b49f95b325306455e5960cc54 SHA512 7e875fa2a811d5d83a187ad155ddbf1c23dd3f34c9b02c2fb6f7d4e3c0ae901e89b3a78cca053acdd45b9a63d73fd08943d807c68443e715fd91c6a816477c02 +AUX gnucash-5.11-boost-1.88.patch 2072 BLAKE2B 493f122be92694776723ff0de20dbfa871fe7502fa8fdc604d2b32cba7c21549f1cea0f11ed799a336de3c74d7df349e5c3f288d6dd137da37fe47900fbc9a63 SHA512 3a768aae3fff666e141a35a953c479c5fba9d7147769c30525407f0027ac49ca684bf84b641735c33a294c442698c93ebd16ecec6eafedac3612419eb622f934 AUX gnucash-5.6-no-werror.patch 1316 BLAKE2B 4e34795d4e1c3b995d7f8940a00664727e8b65b4c535bf4778058eb8c34edeff8c1e50e8afd5929d0f12487f363e706345adc6549aebc4ac32895e37a4f8b544 SHA512 10fbd97013cafd1563903087d9a1462c0b07ea30dd605b1e9efcb835c4d4ce5b6183a6cfde1fce4718d48798492f0c99bd8d5e1f420ce395390664fda4200e4f AUX gnucash-5.8-boost-1.87.patch 492 BLAKE2B a3e19a0b47127c87f91e31814bff32d848ad58dd59a60e440fe9d3609b1d56dea2969aaa9171a7a34e7c06ce4405a01b65c2df60f9facad3924f83ff537cc3b4 SHA512 5a26acdb42cb382490ae8c2c90d535946d8d99e2a8557a064dbb2ab09cc42bda2f1d6bdec7bc5719ad25545f5b9fc1601518e05d1f70cbb9d3586c76051b1da7 AUX gnucash-5.8-gcc15.patch 18468 BLAKE2B 4b7c9eeace4d5ad09b109b8abdd26450ef1413a36d16b475a7392bf8bbb0927f6fc07a974a5bd8a74658b55c4bd28b08578b58738b55a286b7f2106ae640bacb SHA512 33efd12b3229e7e3908e2483b1d4dfe449260b4c40c46fb23f3ebd37dad9130f12a8f83a14de670e868c97199bdbe7c7ece836cf4411dcc83dd9a8ac7eb241dc AUX gnucash-5.8-guile-load-path.patch 4864 BLAKE2B 5af50ac07784aa76a6cf5a0411cae7e43836b97f0588b5bf68b76943c7165d6b55c27caa0464f6f6343644829e8b12d268d58832fbd103bdb8e5a6c2be226ede SHA512 842881b72d6313321b0e15c43a75ce8b02cea5c49d67fa4d5d59f49a9a2876458b4510a8357ab2d9323a2696c5879cd982d12f8d3c266df1434d1d61239bfade DIST gnucash-5.10.tar.bz2 15075046 BLAKE2B 343d4a2fee0cdafc42a58d1bcb4e809b7f5fada24eddf210805d81075d6461626b2cbf37c5d0c4d5d758f0ff46ff3812d849b9d177fd34c4f5e890bbebe848b8 SHA512 2ea31ea9dc6d399f168e47fed4b4641207b2a4b9a5e9eac493477a067e8b8a2817e509cb8ea422480c62336fe87cfe6e3e795e5a8b630e8a3d7635adfc64514d -DIST gnucash-5.8.tar.bz2 14998331 BLAKE2B 3440eec0c6936b446febc385b4b397aa4a0d5a5b710012a59ca6f9d378ca676105f815d05ccabd76be28c7943a3ca155357c2172f1ce0a2f5070d718bac638fd SHA512 3eca261b8be218eb130a75877f2c8b31de55c6c422c1f2d9fadea648efc66a0e7d536117505c4b6f2da7c67d9a01f87db66a0198914d24dea87d00dcd68bfb0f -EBUILD gnucash-5.10.ebuild 6549 BLAKE2B fdedfe31a7a0a0ff65933cccf51d327efead6d331854175804b4c268673a4810f7abb68943d6965f084c8df9a08044c4a3ba0e50df23d4e2edcec22a2b22407b SHA512 9d6aa3b2cc9c1b6521964bc9103068a2f661c63d9b0b5550468dad847a79e7d59b7596f3e9de67fa3939efec542b2f2da374d113933abe2a2cb47b34f5ab51e2 -EBUILD gnucash-5.8-r100.ebuild 6608 BLAKE2B 909bd423c7d06f6dc6da3f5f7ca81bc455859d06504664382e21b5486fa6b95dc5f4b4ecbbc3a0b8bd01a8352bb0f5dca7c26ef457f27d569fcbad8074ae6519 SHA512 168129fda468e84ee42345bc87055fdf27d3094c43135dc49bf70b9f1313d1ebe05bc159819986a9c87f971a189b17a19147fd6072ddbba15209f3a0d5cbe101 +DIST gnucash-5.11.tar.bz2 15165344 BLAKE2B e16f7a4f398abb66bf67c56bd046157a58fcc8c0f68231d7a9c3568747dde605f185888a002f4de3773b18737fdc217ca3eae739e705c1c4d73e2d3132899583 SHA512 72e1bdc446a42db004b517bbf775d80f41b28c908691d823312575041f8524978f51b2bb36d026668b3d095b862db26ea9217339a80acc9deed33de22ba98d80 +EBUILD gnucash-5.10-r1.ebuild 6092 BLAKE2B 6125750b1c661a13ef6e9dd80191d1e4cc52307503a858ddd99fb11f1e16570cbdbcfe8dc0781de8ec98141d60b1134f762e2dfb4e6e06a940d71d0be0f1ff6a SHA512 8411c7a4bf0c53e85be91bd175395ffdf8c17e8e6b720ef540159c1ca9fbee7253ce375f71a369a39faf63baeafb8ec3d4d981ef4840c6f10af74fb00209fac9 +EBUILD gnucash-5.11.ebuild 6105 BLAKE2B 95dc59810f43c156bc5aa4ba97a30cc486697349bc47168648d7ae521649a419af3dbe25da1a6d4a314151d739de67df6a8551aec3c6033416b45428494ce6a7 SHA512 917302b7947a9708132ba1eac4ec753eb48e307586fc0646f149f72f7edf3ba5e9b2c66443289f25849db376f9dfda3f877ffb36f1a9a021d8ea260380152a77 MISC metadata.xml 1852 BLAKE2B 8868aba1d62997b136935fbdd5af21d66a632a0d00a0b44752f60aa30ccef98e51e7a95787ba7f7c1f9e40507523f4488c72e3673202760afaf2fd2c7829100a SHA512 c3a5ed7a36bfa39693d76735dce5b5e5889084bb9a15b3903a0621e48bf9aa9a24aff76ab998e2b2d6ee418f55d8606bdb70fe53aae5b05dce07ecaefe309432 diff --git a/app-office/gnucash/files/gnucash-5.10-swig-4.3.patch b/app-office/gnucash/files/gnucash-5.10-swig-4.3.patch new file mode 100644 index 000000000000..48afe2452b47 --- /dev/null +++ b/app-office/gnucash/files/gnucash-5.10-swig-4.3.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/953429 +https://github.com/Gnucash/gnucash/commit/85084e75d63633b8c7e44b99ee6cc20f421b52fc + +From 85084e75d63633b8c7e44b99ee6cc20f421b52fc Mon Sep 17 00:00:00 2001 +From: John Ralls <jralls@ceridwen.us> +Date: Thu, 26 Dec 2024 11:45:10 -0800 +Subject: [PATCH] Fix python bindings build with Swig-4.3.0. + +--- + bindings/python/time64.i | 11 ++++++++--- + common/cmake_modules/GncAddSwigCommand.cmake | 6 ++++++ + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/bindings/python/time64.i b/bindings/python/time64.i +index 93d9f261f8c..3f85448dedc 100644 +--- a/bindings/python/time64.i ++++ b/bindings/python/time64.i +@@ -132,6 +132,12 @@ + $1 = &secs; + } + ++#ifdef HAVE_SWIG_APPENDOUTPUT ++#define SWIG_APPENDOUTPUT(res, func) SWIG_AppendOutput(res, func) ++#else ++#define SWIG_APPENDOUTPUT(res, func) SWIG_Python_AppendOutput(res, func) ++#endif ++ + %typemap(argout) time64 *date (time64 secs) { + PyDateTime_IMPORT; + PyObject *tp; +@@ -148,9 +154,8 @@ + tp = PyDateTime_FromDateAndTime(t.tm_year + 1900, t.tm_mon + 1, + t.tm_mday, t.tm_hour, t.tm_min, + t.tm_sec, 0); +- +- $result = SWIG_Python_AppendOutput($result, tp); +- } else $result = SWIG_Python_AppendOutput($result, Py_None); ++ $result = SWIG_APPENDOUTPUT($result, tp); ++ } else $result = SWIG_APPENDOUTPUT($result, Py_None); + } + + %apply time64 *date { time64 *last_date }; +diff --git a/common/cmake_modules/GncAddSwigCommand.cmake b/common/cmake_modules/GncAddSwigCommand.cmake +index 811f347608d..a3c8dac995f 100644 +--- a/common/cmake_modules/GncAddSwigCommand.cmake ++++ b/common/cmake_modules/GncAddSwigCommand.cmake +@@ -86,6 +86,12 @@ macro (gnc_add_swig_python_command _target _out_var _py_out_var _output _py_outp + ) + + set (PYTHON_SWIG_FLAGS ${DEFAULT_SWIG_PYTHON_FLAGS}) ++ ++ if (SWIG_VERSION VERSION_GREATER_EQUAL "4.3.0") ++ list(APPEND PYTHON_SWIG_FLAGS ++ -DHAVE_SWIG_APPENDOUTPUT=1) ++ endif() ++ + foreach (dir ${DEFAULT_SWIG_PYTHON_C_INCLUDES} ${_include_dirs}) + list (APPEND PYTHON_SWIG_FLAGS "-I${dir}") + endforeach (dir) diff --git a/app-office/gnucash/files/gnucash-5.11-boost-1.88.patch b/app-office/gnucash/files/gnucash-5.11-boost-1.88.patch new file mode 100644 index 000000000000..1c58902cab4b --- /dev/null +++ b/app-office/gnucash/files/gnucash-5.11-boost-1.88.patch @@ -0,0 +1,58 @@ +From 99f86d31ed52bafada4d0b4036cada89b1ccdfaf Mon Sep 17 00:00:00 2001 +From: John Ralls <jralls@ceridwen.us> +Date: Fri, 2 May 2025 10:11:55 -0700 +Subject: [PATCH] Bug 799594 - GnuCash 5.11 fails to build with boost 1.88 + +Boost Process 1.88 defaults to the new V2 API introduced in Boost +1.81. https://repology.org/project/boost/versions shows that distro +support for boost 1.81 and later is spotty at best so we won't be able +to migrate to v2 until that improves. +--- + libgnucash/app-utils/gnc-quotes.cpp | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp +index 1fdf64a385c..fcc67cc782e 100644 +--- a/libgnucash/app-utils/gnc-quotes.cpp ++++ b/libgnucash/app-utils/gnc-quotes.cpp +@@ -36,10 +36,27 @@ + #endif + #include <boost/algorithm/string.hpp> + #include <boost/filesystem.hpp> ++#include <boost/version.hpp> ++#if BOOST_VERSION < 108800 ++#include <boost/process.hpp> + #ifdef BOOST_WINDOWS_API + #include <boost/process/windows.hpp> + #endif +-#include <boost/process.hpp> ++#else ++#include <boost/process/v1/async.hpp> ++#include <boost/process/v1/child.hpp> ++#include <boost/process/v1/env.hpp> ++#include <boost/process/v1/environment.hpp> ++#include <boost/process/v1/error.hpp> ++#include <boost/process/v1/group.hpp> ++#include <boost/process/v1/io.hpp> ++#include <boost/process/v1/pipe.hpp> ++#include <boost/process/v1/search_path.hpp> ++#include <boost/process/v1/start_dir.hpp> ++#ifdef BOOST_WINDOWS_API ++#include <boost/process/v1/windows.hpp> ++#endif ++#endif + #include <boost/regex.hpp> + #include <boost/property_tree/ptree.hpp> + #include <boost/property_tree/json_parser.hpp> +@@ -68,7 +85,11 @@ static const char* yh_api_env = "FINANCEAPI_API_KEY"; + static const char* yh_api_key = "yhfinance-api-key"; + + namespace bl = boost::locale; ++#if BOOST_VERSION < 108800 + namespace bp = boost::process; ++#else ++namespace bp = boost::process::v1; ++#endif + namespace bfs = boost::filesystem; + namespace bpt = boost::property_tree; + namespace bio = boost::iostreams; diff --git a/app-office/gnucash/gnucash-5.10.ebuild b/app-office/gnucash/gnucash-5.10-r1.ebuild index acc455214339..d5fbe6a86630 100644 --- a/app-office/gnucash/gnucash-5.10.ebuild +++ b/app-office/gnucash/gnucash-5.10-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GUILE_REQ_USE="regex" GUILE_COMPAT=( 2-2 3-0 ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake flag-o-matic gnome2-utils guile-single python-single-r1 +inherit cmake flag-o-matic gnome2 guile-single python-single-r1 xdg # Please bump with app-doc/gnucash-docs DESCRIPTION="Personal finance manager" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2 LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes smartcard sqlite test" # Tests were previously restricted because guile would try to use installed, # not just-built modules. See https://bugs.gnucash.org/show_bug.cgi?id=799159#c1. @@ -41,7 +41,7 @@ RDEPEND=" >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= - dev-libs/libxml2:2 + dev-libs/libxml2:2= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] @@ -119,6 +119,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch" "${FILESDIR}/${P}-import-qif.patch" "${FILESDIR}/${PN}-5.8-guile-load-path.patch" + "${FILESDIR}/${P}-swig-4.3.patch" ) pkg_setup() { @@ -136,18 +137,12 @@ src_prepare() { # Fix tests writing to /tmp local fixtestfiles=( + bindings/python/example_scripts/simple_session.py + bindings/python/sqlite3test.c + bindings/python/example_scripts/simple_test.py gnucash/report/test/test-report-html.scm - gnucash/report/reports/standard/test/test-invoice.scm - gnucash/report/reports/standard/test/test-new-owner-report.scm - gnucash/report/reports/standard/test/test-owner-report.scm - gnucash/report/reports/standard/test/test-transaction.scm - gnucash/report/reports/standard/test/test-portfolios.scm - gnucash/report/reports/standard/test/test-charts.scm - gnucash/report/test/test-report.scm - gnucash/report/test/test-commodity-utils.scm gnucash/report/test/test-report-extras.scm libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp - libgnucash/backend/xml/test/test-xml-pricedb.cpp ) local x for x in "${fixtestfiles[@]}"; do @@ -228,20 +223,17 @@ src_install() { fi } +pkg_preinst() { + gnome2_pkg_preinst + xdg_pkg_preinst +} + pkg_postinst() { - if use gui ; then - xdg_icon_cache_update - gnome2_schemas_update - fi - xdg_desktop_database_update - xdg_mimeinfo_database_update + gnome2_pkg_postinst + xdg_pkg_postinst } pkg_postrm() { - if use gui ; then - xdg_icon_cache_update - gnome2_schemas_update - fi - xdg_desktop_database_update - xdg_mimeinfo_database_update + gnome2_pkg_postrm + xdg_pkg_postrm } diff --git a/app-office/gnucash/gnucash-5.8-r100.ebuild b/app-office/gnucash/gnucash-5.11.ebuild index abfe06c45785..438a6691737d 100644 --- a/app-office/gnucash/gnucash-5.8-r100.ebuild +++ b/app-office/gnucash/gnucash-5.11.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GUILE_REQ_USE="regex" GUILE_COMPAT=( 2-2 3-0 ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..13} ) -inherit cmake flag-o-matic gnome2-utils guile-single python-single-r1 +inherit cmake flag-o-matic gnome2 guile-single python-single-r1 xdg # Please bump with app-doc/gnucash-docs DESCRIPTION="Personal finance manager" @@ -16,8 +16,8 @@ SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2 LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86" -IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes smartcard sqlite test" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="aqbanking debug doc examples +gui mysql nls ofx postgres python quotes smartcard sqlite test" # Tests were previously restricted because guile would try to use installed, # not just-built modules. See https://bugs.gnucash.org/show_bug.cgi?id=799159#c1. # TODO: as of 5.10, the ebuild should handle this OK. If no issues come up, @@ -37,18 +37,21 @@ REQUIRED_USE=" # dependency, we just rely on that. RDEPEND=" ${GUILE_DEPS} + >=app-crypt/libsecret-0.18 >=dev-libs/glib-2.56.1:2 >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= - dev-libs/libxml2:2 + dev-libs/libxml2:2= dev-libs/libxslt + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango aqbanking? ( >=net-libs/aqbanking-6[ofx?] >=sys-libs/gwenhywfar-5.6.0:= smartcard? ( sys-libs/libchipcard ) ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf @@ -95,6 +98,7 @@ DEPEND=" BDEPEND=" dev-lang/swig >=dev-build/cmake-3.10 + dev-libs/libxslt virtual/pkgconfig python? ( $(python_gen_cond_dep ' @@ -117,10 +121,8 @@ PATCHES=( # This is only to prevent webkit2gtk-4 from being selected. # https://bugs.gentoo.org/893676 "${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch" - # GCC 15 backport - "${FILESDIR}/${PN}-5.8-gcc15.patch" - "${FILESDIR}/${PN}-5.8-boost-1.87.patch" "${FILESDIR}/${PN}-5.8-guile-load-path.patch" + "${FILESDIR}/${PN}-5.11-boost-1.88.patch" ) pkg_setup() { @@ -138,18 +140,12 @@ src_prepare() { # Fix tests writing to /tmp local fixtestfiles=( + bindings/python/example_scripts/simple_session.py + bindings/python/sqlite3test.c + bindings/python/example_scripts/simple_test.py gnucash/report/test/test-report-html.scm - gnucash/report/reports/standard/test/test-invoice.scm - gnucash/report/reports/standard/test/test-new-owner-report.scm - gnucash/report/reports/standard/test/test-owner-report.scm - gnucash/report/reports/standard/test/test-transaction.scm - gnucash/report/reports/standard/test/test-portfolios.scm - gnucash/report/reports/standard/test/test-charts.scm - gnucash/report/test/test-report.scm - gnucash/report/test/test-commodity-utils.scm gnucash/report/test/test-report-extras.scm libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp - libgnucash/backend/xml/test/test-xml-pricedb.cpp ) local x for x in "${fixtestfiles[@]}"; do @@ -230,20 +226,17 @@ src_install() { fi } +pkg_preinst() { + gnome2_pkg_preinst + xdg_pkg_preinst +} + pkg_postinst() { - if use gui ; then - xdg_icon_cache_update - gnome2_schemas_update - fi - xdg_desktop_database_update - xdg_mimeinfo_database_update + gnome2_pkg_postinst + xdg_pkg_postinst } pkg_postrm() { - if use gui ; then - xdg_icon_cache_update - gnome2_schemas_update - fi - xdg_desktop_database_update - xdg_mimeinfo_database_update + gnome2_pkg_postrm + xdg_pkg_postrm } |