From e4ad65fef49465392b236cf7db29ac25fb0d5a429d968543dc4930e2b3da5de9 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 26 May 2024 08:44:56 +0000 Subject: [PATCH 1/3] Accepting request 1175488 from home:p_conrad:branches - Included upstream fix for broken qif import OBS-URL: https://build.opensuse.org/request/show/1175488 OBS-URL: https://build.opensuse.org/package/show/Office/gnucash?expand=0&rev=42 --- gnucash-fix-qif-import.patch | 32 ++++++++++++++++++++++++++++++++ gnucash.changes | 5 +++++ gnucash.spec | 1 + 3 files changed, 38 insertions(+) create mode 100644 gnucash-fix-qif-import.patch diff --git a/gnucash-fix-qif-import.patch b/gnucash-fix-qif-import.patch new file mode 100644 index 0000000..d63041a --- /dev/null +++ b/gnucash-fix-qif-import.patch @@ -0,0 +1,32 @@ +See https://github.com/Gnucash/gnucash/commit/b33b864c2fa0ba72d1940465e7fa962dd36833c9 + +--- gnucash-5.6/gnucash/import-export/qif-imp/qif-to-gnc.scm.orig 2024-04-02 23:12:50.335306666 +0200 ++++ gnucash-5.6/gnucash/import-export/qif-imp/qif-to-gnc.scm 2024-04-01 23:13:12.071450498 +0200 +@@ -596,13 +596,6 @@ + (else + (apply xaccTransSetDate gnc-xtn (qif-xtn:date qif-xtn)))) + +- (unless qif-action +- (qif-import:log progress-dialog "qif-import:qif-xtn-to-gnc-xtn" +- (format #f (G_ "Missing QIF investment action for transaction dated ~a.") +- (qof-print-date (qif-date-to-time64 qif-date)))) +- (throw 'missing-action "qif-import:qif-xtn-to-gnc-xtn" "Missing investment action." +- #f #f)) +- + ;; fixme: bug #105 + (if qif-payee + (xaccTransSetDescription gnc-xtn qif-payee)) +@@ -743,6 +736,13 @@ + + (if (not num-shares) (set! num-shares (gnc-numeric-zero))) + ++ (unless qif-action ++ (qif-import:log progress-dialog "qif-import:qif-xtn-to-gnc-xtn" ++ (format #f (G_ "Missing QIF investment action for transaction dated ~a.") ++ (qof-print-date (qif-date-to-time64 qif-date)))) ++ (throw 'missing-action "qif-import:qif-xtn-to-gnc-xtn" "Missing investment action." ++ #f #f)) ++ + ;; Determine the extended price of all shares without commission. + (if xtn-amt + ;; Adjust for commission (if any). diff --git a/gnucash.changes b/gnucash.changes index 215f847..f6da849 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 21 08:58:50 UTC 2024 - Peter Conrad + +- Included upstream fix for broken qif import + ------------------------------------------------------------------- Thu Apr 25 20:18:50 UTC 2024 - Jaime Marquínez Ferrándiz diff --git a/gnucash.spec b/gnucash.spec index be23af4..4b85278 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -48,6 +48,7 @@ Patch0: gnucash-cpan-warning.patch # PATCH-FIX-UPSTREAM gnucash-libm.patch gh#gnucash/gnucash#632 dimstar@opensuse.org -- Link libm: gnucash uses e.g. log10 without explicitly requesting libm Patch1: gnucash-libm.patch Patch2: gnucash-4.1-fix-gtest-path.patch +Patch3: gnucash-fix-qif-import.patch BuildRequires: cmake >= 3.14 BuildRequires: doxygen From 07ee6c8ac80a66707a4777d63dd1dcae0cc1645781ab4b471f847804f66a9a17 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 26 May 2024 08:48:24 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Office/gnucash?expand=0&rev=43 --- gnucash.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnucash.changes b/gnucash.changes index f6da849..881ddbe 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -2,6 +2,7 @@ Tue May 21 08:58:50 UTC 2024 - Peter Conrad - Included upstream fix for broken qif import + * gnucash-fix-qif-import.patch ------------------------------------------------------------------- Thu Apr 25 20:18:50 UTC 2024 - Jaime Marquínez Ferrándiz @@ -140,6 +141,7 @@ Sat Sep 30 19:24:29 UTC 2023 - Johannes Engel + Include timezone in price-quote date diagnostic messages. ------------------------------------------------------------------- +>>>>>>> ./gnucash.changes.new Sat Jul 8 13:02:24 UTC 2023 - Johannes Engel - Update to 5.3 From 7379ac9315a7c050c4026e9f22a0443ab14007d7cc8a978ae5a40b520c97231b Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 26 May 2024 08:49:18 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Office/gnucash?expand=0&rev=44 --- gnucash.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/gnucash.changes b/gnucash.changes index 881ddbe..1554cc2 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -141,7 +141,6 @@ Sat Sep 30 19:24:29 UTC 2023 - Johannes Engel + Include timezone in price-quote date diagnostic messages. ------------------------------------------------------------------- ->>>>>>> ./gnucash.changes.new Sat Jul 8 13:02:24 UTC 2023 - Johannes Engel - Update to 5.3