ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openboard: Update to 1.7.1.

Browse source 
* gnu/packages/education.scm (openboard): Update to 1.7.1.
[arguments]<#:phases>: Remove unnecessary fix.

Change-Id: I15be965a15baa6458217e6e5c88a457b8c65e810
This commit is contained in:
Nicolas Goaziou 2024-06-19 21:48:54 +02:00
parent e32e3d0a03
commit aa88a99199
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 110 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/education.scm
View file

@ -500,23 +500,18 @@ (define-public toutenclic
(license license:gpl3))) (license license:gpl3)))
(define-public openboard (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 "47a96e1d6bbdc0250977d22f1b79f11fcc1cbeee")
(revision "0"))
(package (package
(name "openboard") (name "openboard")
(version (git-version "1.7-dev" revision commit)) (version "1.7.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/OpenBoard-org/OpenBoard") (url "https://github.com/OpenBoard-org/OpenBoard")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "04pwmg41vlkwigym3zzkid6srh6f05b44g4mbihd6mhj6vsagx1f")))) (base32 "1lxwf50n0bfjjnpq5z82f3apsv9mn834js7f2spw1k1f06a72z41"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
@ -524,26 +519,15 @@ (define-public openboard
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'set-initial-values (add-after 'unpack 'set-initial-values
;; Remove useless "Check for updates" action from menu. ;; Remove useless "Check for updates" action from menu. Also
;; Also prevent pop-up window about importing Open Sankore ;; prevent pop-up window about importing Open Sankore documents
;; documents since we don't package OpenBoard-Importer. ;; since we don't package OpenBoard-Importer.
(lambda _ (lambda _
(substitute* "src/core/UBSettings.cpp" (substitute* "src/core/UBSettings.cpp"
(("(appHideCheckForSoftwareUpdate = .*?)false(\\);)" _ beg end) (("(appHideCheckForSoftwareUpdate = .*?)false(\\);)" _ beg end)
(string-append beg "true" end)) (string-append beg "true" end))
(("(appLookForOpenSankoreInstall = .*?)true(\\);)" _ beg end) (("(appLookForOpenSankoreInstall = .*?)true(\\);)" _ beg end)
(string-append beg "false" end))))) (string-append beg "false" end)))))
(add-after 'unpack 'fix-build-error
;; XXX: `errorOpeningVirtualKeyboard' variable is only
;; defined when building for OSX. Yet,
;; "UBBoardController.cpp" relies on it unconditionally,
;; resulting in a build failure. Here, we get rid of
;; that variable, assuming it is always false (its
;; default value when building for OSX).
(lambda _
(substitute* "src/board/UBBoardController.cpp"
(("if \\(!UBPlatformUtils::errorOpeningVirtualKeyboard\\)")
""))))
(add-after 'unpack 'fix-hard-coded-env (add-after 'unpack 'fix-hard-coded-env
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/frameworks/UBPlatformUtils_linux.cpp" (substitute* "src/frameworks/UBPlatformUtils_linux.cpp"
@ -628,7 +612,7 @@ (define-public openboard
designed primarily for use in schools and universities. It can be designed primarily for use in schools and universities. It can be
used both with interactive whiteboards or in a dual-screen setup with used both with interactive whiteboards or in a dual-screen setup with
a pen-tablet display and a beamer.") a pen-tablet display and a beamer.")
(license license:gpl3)))) (license license:gpl3)))
(define-public fet (define-public fet
(package (package