[bug#63534] [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1

[bug#63534] [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1

[Giovanni Biscuolo]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1 --]
[-- Type: text/x-patch, Size: 2656 bytes --]

From c0405d2762eb173fb7357de700f1aefc606682f6 Mon Sep 17 00:00:00 2001
Message-Id: <c0405d2762eb173fb7357de700f1aefc606682f6.1684218578.git.g@xelera.eu>
From: Giovanni Biscuolo <g@xelera.eu>
Date: Tue, 16 May 2023 08:08:56 +0200
Subject: [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1

* gnu/packages/education.scm (openboard)[version]: Update to 1.7-dev-0.47a96e1
[arguments]: Fix quazip and poppler library path
---
this patch updates openboard using the last commit from branch 1.7-dev,
resolving bug #63371

I've also changed the version to 1.7-dev, because this is what this
package is actually using since the last packaged version 

gnu/packages/education.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index acd1297a72..2b7e070976 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -452,11 +452,11 @@ (define-public openboard
   ;; The last release builds from qtwebkit, which has been removed from
   ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with
   ;; qtwebengine-5.
-  (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311
-        (revision "1"))
+  (let ((commit "47a96e1d6bbdc0250977d22f1b79f11fcc1cbeee")
+        (revision "0"))
     (package
       (name "openboard")
-      (version (git-version "1.6.1" revision commit))
+      (version (git-version "1.7-dev" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -465,7 +465,7 @@ (define-public openboard
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1763l5dywirzidzc93726dggf9819p47hh6a7p7dwzd1bfq1wb2q"))))
+          (base32 "04pwmg41vlkwigym3zzkid6srh6f05b44g4mbihd6mhj6vsagx1f"))))
       (build-system qt-build-system)
       (arguments
        (list
@@ -500,10 +500,10 @@ (define-public openboard
             (add-after 'unpack 'fix-library-path
               (lambda* (#:key inputs #:allow-other-keys)
                 (substitute* "OpenBoard.pro"
-                  (("/usr/include/quazip")
-                   (search-input-directory inputs "/include/quazip5"))
+                  (("/usr/include/quazip5")
+                   (search-input-directory inputs "include/quazip5"))
                   (("/usr/include/poppler")
-                   (search-input-directory inputs "/include/poppler")))))
+                   (search-input-directory inputs "include/poppler")))))
             (replace 'configure
               (lambda _
                 (invoke "qmake" "OpenBoard.pro")))
-- 
2.39.2

bug#63371: [bug#63534] [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1

[Nicolas Goaziou]

Hello,

Giovanni Biscuolo <g@xelera.eu> writes:

> From c0405d2762eb173fb7357de700f1aefc606682f6 Mon Sep 17 00:00:00 2001
> Message-Id: <c0405d2762eb173fb7357de700f1aefc606682f6.1684218578.git.g@xelera.eu>
> From: Giovanni Biscuolo <g@xelera.eu>
> Date: Tue, 16 May 2023 08:08:56 +0200
> Subject: [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1
>
> * gnu/packages/education.scm (openboard)[version]: Update to
> 1.7-dev-0.47a96e1

Nitpick: missing full stops at the end of sentences.

> [arguments]: Fix quazip and poppler library path


[...]

>                  (substitute* "OpenBoard.pro"
> -                  (("/usr/include/quazip")
> -                   (search-input-directory inputs "/include/quazip5"))
> +                  (("/usr/include/quazip5")
> +                   (search-input-directory inputs "include/quazip5"))
>                    (("/usr/include/poppler")
> -                   (search-input-directory inputs "/include/poppler")))))
> +                   (search-input-directory inputs "include/poppler")))))

I don't think these changes are warranted. Do they fix something?

Otherwise LGTM.

Regards,
-- 
Nicolas Goaziou

[bug#63534] [PATCH] gnu: openboard: Update to 1.7-dev-0.47a96e1

[Giovanni Biscuolo]

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

Hello,

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

[...]

> Nitpick: missing full stops at the end of sentences.

OK, I'll prepare a V2 patch ASAP

>> [arguments]: Fix quazip and poppler library path

sorry: maybe this description is a little bit misleading

> [...]
>
>>                  (substitute* "OpenBoard.pro"
>> -                  (("/usr/include/quazip")
>> -                   (search-input-directory inputs "/include/quazip5"))
>> +                  (("/usr/include/quazip5")

This one is important, it fixes quazip include path (/usr/include/quazip
-> /usr/include/quazip5)

>> +                   (search-input-directory inputs "include/quazip5"))
>>                    (("/usr/include/poppler")
>> -                   (search-input-directory inputs "/include/poppler")))))
>> +                   (search-input-directory inputs "include/poppler")))))
>
> I don't think these changes are warranted. Do they fix something?

No [1], I'll strip this changes from the V2 of this patch

> Otherwise LGTM.

Thanks! Gio'

-- 
Giovanni Biscuolo

Xelera IT Infrastructures

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

[bug#63534] [PATCH v2] gnu: openboard: Update to 1.7-dev-0.47a96e1.

[Giovanni Biscuolo]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: 0001-gnu-openboard-Update-to-1.7-dev-0.47a96e1.patch --]
[-- Type: text/x-diff, Size: 2238 bytes --]

From 65b5eeb3acfcd2be29c6cc4e41c45f728cccb969 Mon Sep 17 00:00:00 2001
Message-Id: <65b5eeb3acfcd2be29c6cc4e41c45f728cccb969.1685033634.git.g@xelera.eu>
From: Giovanni Biscuolo <g@xelera.eu>
Date: Tue, 16 May 2023 08:08:56 +0200
Subject: [PATCH v2] gnu: openboard: Update to 1.7-dev-0.47a96e1.

* gnu/packages/education.scm (openboard)[version]: Update to 1.7-dev-0.47a96e1.
[arguments]: Fix quazip substitution in 'fix-library-path.
---
 gnu/packages/education.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index acd1297a72..406c1c1a35 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -452,11 +452,11 @@ (define-public openboard
   ;; The last release builds from qtwebkit, which has been removed from
   ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with
   ;; qtwebengine-5.
-  (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311
-        (revision "1"))
+  (let ((commit "47a96e1d6bbdc0250977d22f1b79f11fcc1cbeee")
+        (revision "0"))
     (package
       (name "openboard")
-      (version (git-version "1.6.1" revision commit))
+      (version (git-version "1.7-dev" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -465,7 +465,7 @@ (define-public openboard
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1763l5dywirzidzc93726dggf9819p47hh6a7p7dwzd1bfq1wb2q"))))
+          (base32 "04pwmg41vlkwigym3zzkid6srh6f05b44g4mbihd6mhj6vsagx1f"))))
       (build-system qt-build-system)
       (arguments
        (list
@@ -500,7 +500,7 @@ (define-public openboard
             (add-after 'unpack 'fix-library-path
               (lambda* (#:key inputs #:allow-other-keys)
                 (substitute* "OpenBoard.pro"
-                  (("/usr/include/quazip")
+                  (("/usr/include/quazip5")
                    (search-input-directory inputs "/include/quazip5"))
                   (("/usr/include/poppler")
                    (search-input-directory inputs "/include/poppler")))))
-- 
2.39.2


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

bug#63534: [PATCH v2] gnu: openboard: Update to 1.7-dev-0.47a96e1.

[Nicolas Goaziou]

Hello,

Giovanni Biscuolo <g@xelera.eu> writes:

> From 65b5eeb3acfcd2be29c6cc4e41c45f728cccb969 Mon Sep 17 00:00:00 2001
> Message-Id: <65b5eeb3acfcd2be29c6cc4e41c45f728cccb969.1685033634.git.g@xelera.eu>
> From: Giovanni Biscuolo <g@xelera.eu>
> Date: Tue, 16 May 2023 08:08:56 +0200
> Subject: [PATCH v2] gnu: openboard: Update to 1.7-dev-0.47a96e1.
>
> * gnu/packages/education.scm (openboard)[version]: Update to 1.7-dev-0.47a96e1.
> [arguments]: Fix quazip substitution in 'fix-library-path.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou