[bug#69068] [PATCH] gnu: kitsas: Update to 5.4.1

[bug#69068] [PATCH] gnu: kitsas: Update to 5.4.1

[Saku Laesvuori via Guix-patches via]

* gnu/packages/finance.scm (kitsas): Update to 5.4.1.

Change-Id: I968579d762ebecef9f9e8b602682587a054c41ad
---
 gnu/packages/finance.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 98a220385b..96e2729dda 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1307,7 +1307,7 @@ (define-public keepkey-agent
 (define-public kitsas
   (package
     (name "kitsas")
-    (version "4.0.3")
+    (version "5.4.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1316,17 +1316,24 @@ (define-public kitsas
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hrbsqqm6v2pmjq17s7i4akjgclz3d051mg02vcykq80xgxvbkgf"))))
+                "16zkfpl5d9ia202fqg5vrhjqdw0g6wp044ih6n7nz2hbxj9y3m1z"))))
     (build-system qt-build-system)
-    (inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5))
+    (inputs (list libzip qtsvg qtwebengine qt5compat))
     (arguments
      (list #:tests? #f               ;XXX: some tests fail and others segfault
            #:test-target "check"
+           #:qtbase qtbase
            #:phases
            #~(modify-phases %standard-phases
                (replace 'configure
                  (lambda* _
                    (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
+               ;; The tests are not maintained and some don't even build
+               (add-before 'configure 'disable-broken-tests
+                 (lambda _
+                   (substitute* "kitsasproject.pro"
+                     ((" *(unittest|testit).*") "")
+                     (("\\\\") ""))))
                (replace 'install
                  (lambda* _
                    (install-file "kitsas/kitsas"

base-commit: f2102cb5b9239be2ed2023b908b726af542e0124
-- 
2.41.0

[bug#69068] [PATCH] gnu: kitsas: Update to 5.4.1

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2240 bytes --]


Saku Laesvuori via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/finance.scm (kitsas): Update to 5.4.1.
>
> Change-Id: I968579d762ebecef9f9e8b602682587a054c41ad
> ---
>  gnu/packages/finance.scm | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> index 98a220385b..96e2729dda 100644
> --- a/gnu/packages/finance.scm
> +++ b/gnu/packages/finance.scm
> @@ -1307,7 +1307,7 @@ (define-public keepkey-agent
>  (define-public kitsas
>    (package
>      (name "kitsas")
> -    (version "4.0.3")
> +    (version "5.4.1")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> @@ -1316,17 +1316,24 @@ (define-public kitsas
>                (file-name (git-file-name name version))
>                (sha256
>                 (base32
> -                "0hrbsqqm6v2pmjq17s7i4akjgclz3d051mg02vcykq80xgxvbkgf"))))
> +                "16zkfpl5d9ia202fqg5vrhjqdw0g6wp044ih6n7nz2hbxj9y3m1z"))))
>      (build-system qt-build-system)
> -    (inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5))
> +    (inputs (list libzip qtsvg qtwebengine qt5compat))
>      (arguments
>       (list #:tests? #f               ;XXX: some tests fail and others segfault
>             #:test-target "check"
> +           #:qtbase qtbase
>             #:phases
>             #~(modify-phases %standard-phases
>                 (replace 'configure
>                   (lambda* _
>                     (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
> +               ;; The tests are not maintained and some don't even build
> +               (add-before 'configure 'disable-broken-tests
> +                 (lambda _
> +                   (substitute* "kitsasproject.pro"
> +                     ((" *(unittest|testit).*") "")
> +                     (("\\\\") ""))))
>                 (replace 'install
>                   (lambda* _
>                     (install-file "kitsas/kitsas"
>
> base-commit: f2102cb5b9239be2ed2023b908b726af542e0124

The commit message is missing information on the non-version changes to
the package.

In particular, the removal of qtbase from inputs confuses me, is this
not needed?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#69068] [PATCH] gnu: kitsas: Update to 5.4.1

[Saku Laesvuori via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 3195 bytes --]

On Tue, Feb 13, 2024 at 11:30:50AM +0000, Christopher Baines wrote:
> 
> Saku Laesvuori via Guix-patches via <guix-patches@gnu.org> writes:
> 
> > * gnu/packages/finance.scm (kitsas): Update to 5.4.1.
> >
> > Change-Id: I968579d762ebecef9f9e8b602682587a054c41ad
> > ---
> >  gnu/packages/finance.scm | 13 ++++++++++---
> >  1 file changed, 10 insertions(+), 3 deletions(-)
> >
> > diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> > index 98a220385b..96e2729dda 100644
> > --- a/gnu/packages/finance.scm
> > +++ b/gnu/packages/finance.scm
> > @@ -1307,7 +1307,7 @@ (define-public keepkey-agent
> >  (define-public kitsas
> >    (package
> >      (name "kitsas")
> > -    (version "4.0.3")
> > +    (version "5.4.1")
> >      (source (origin
> >                (method git-fetch)
> >                (uri (git-reference
> > @@ -1316,17 +1316,24 @@ (define-public kitsas
> >                (file-name (git-file-name name version))
> >                (sha256
> >                 (base32
> > -                "0hrbsqqm6v2pmjq17s7i4akjgclz3d051mg02vcykq80xgxvbkgf"))))
> > +                "16zkfpl5d9ia202fqg5vrhjqdw0g6wp044ih6n7nz2hbxj9y3m1z"))))
> >      (build-system qt-build-system)
> > -    (inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5))
> > +    (inputs (list libzip qtsvg qtwebengine qt5compat))
> >      (arguments
> >       (list #:tests? #f               ;XXX: some tests fail and others segfault
> >             #:test-target "check"
> > +           #:qtbase qtbase
> >             #:phases
> >             #~(modify-phases %standard-phases
> >                 (replace 'configure
> >                   (lambda* _
> >                     (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
> > +               ;; The tests are not maintained and some don't even build
> > +               (add-before 'configure 'disable-broken-tests
> > +                 (lambda _
> > +                   (substitute* "kitsasproject.pro"
> > +                     ((" *(unittest|testit).*") "")
> > +                     (("\\\\") ""))))
> >                 (replace 'install
> >                   (lambda* _
> >                     (install-file "kitsas/kitsas"
> >
> > base-commit: f2102cb5b9239be2ed2023b908b726af542e0124
> 
> The commit message is missing information on the non-version changes to
> the package.

All the changes are part of updating the package. The new version is
built against Qt6 and requires different inputs, which also makes
compiling the tests fail as they are not maintained to work with those
new inputs. Earlier just passing #:tests? #f was sufficient to bypass
them because they compiled fine and only failed when ran.

I can try to write a better commit message if you tell which parts
require their own lines, or you can clarify it yourself when applying.

> In particular, the removal of qtbase from inputs confuses me, is this
> not needed?

It is added implicitly by qt-build-system based on the #:qtbase
argument. I don't know if qt-build-system worked like that when I
submitted the first version of this package, but it probably did and I
just didn't realize it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#69068] To test or not to test?

[Andreas Enge]

Hello,

I also looked at this just now and am confused by the test situation.
Should one not either disable tests altogether, or just comment out
some of them?

Andreas

[bug#69068] To test or not to test?

[Saku Laesvuori via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

On Wed, Feb 28, 2024 at 11:32:43AM +0100, Andreas Enge wrote:
> Hello,
> 
> I also looked at this just now and am confused by the test situation.
> Should one not either disable tests altogether, or just comment out
> some of them?

I don't believe any of them even compile with Qt6. The test suite has
been unmaintained for years, so it doesn't really tell anything about
whether the program works correctly or not.

I would certainly agree that it is better to remove just the failing
ones if the issues were actual test failures due to how Guix packaging
works. Here the problem is that the project effectively no longer has a
test suite.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#69068] To test or not to test?

[Andreas Enge]

Am Wed, Feb 28, 2024 at 01:47:47PM +0200 schrieb Saku Laesvuori:
> I don't believe any of them even compile with Qt6. The test suite has
> been unmaintained for years, so it doesn't really tell anything about
> whether the program works correctly or not.

Sorry for not being more precise:

I am wondering if this part of the patch:
+               ;; The tests are not maintained and some don't even build
+               (add-before 'configure 'disable-broken-tests
+                 (lambda _
+                   (substitute* "kitsasproject.pro"
+                     ((" *(unittest|testit).*") "")
+                     (("\\\\") ""))))

is of interest given that there already is
      (list #:tests? #f               ;XXX: some tests fail and others segfault
            #:test-target "check"

?

Andreas

[bug#69068] To test or not to test?

[Andreas Enge]

Sorry, I see that you already answered this question before. I will
prepare to push.

Andreas

bug#69068: To test or not to test?

[Andreas Enge]

Am Wed, Feb 28, 2024 at 01:49:22PM +0100 schrieb Andreas Enge:
> Sorry, I see that you already answered this question before. I will
> prepare to push.

Following the rust team merge, I wanted to rebuild the package once more,
which succeeded. Pushed, thanks for your patience!

Andreas