From patchwork Sat Mar 5 23:16:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 37625 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9D6DF27BBEA; Sat, 5 Mar 2022 23:17:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_PDS_PRO_TLD, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2956927BBE9 for ; Sat, 5 Mar 2022 23:17:15 +0000 (GMT) Received: from localhost ([::1]:45176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQdeE-0001PA-BS for patchwork@mira.cbaines.net; Sat, 05 Mar 2022 18:17:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQde2-0001Oo-6G for guix-patches@gnu.org; Sat, 05 Mar 2022 18:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQde1-0003Ma-UR for guix-patches@gnu.org; Sat, 05 Mar 2022 18:17:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQde1-0001ug-RA for guix-patches@gnu.org; Sat, 05 Mar 2022 18:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49943] [PATCH] gnu: Add openboard Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Mar 2022 23:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Maxim Cournoyer Cc: 49943@debbugs.gnu.org Received: via spool by 49943-submit@debbugs.gnu.org id=B49943.16465221795275 (code B ref 49943); Sat, 05 Mar 2022 23:17:01 +0000 Received: (at 49943) by debbugs.gnu.org; 5 Mar 2022 23:16:19 +0000 Received: from localhost ([127.0.0.1]:49418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQddK-0001Ma-Oh for submit@debbugs.gnu.org; Sat, 05 Mar 2022 18:16:19 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:47991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQddH-0001Fj-PD for 49943@debbugs.gnu.org; Sat, 05 Mar 2022 18:16:17 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 073C4100004; Sat, 5 Mar 2022 23:16:08 +0000 (UTC) From: Nicolas Goaziou In-Reply-To: <87r17msobc.fsf_-_@gmail.com> (Maxim Cournoyer's message of "Mon, 28 Feb 2022 15:56:07 -0500") References: <87czqoc7tj.fsf@nicolasgoaziou.fr> <87bkywlwp6.fsf@gmail.com> <87a6eghrw9.fsf@nicolasgoaziou.fr> <875yp0vqa1.fsf@gmail.com> <87r17msobc.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) Date: Sun, 06 Mar 2022 00:16:08 +0100 Message-ID: <87czj02don.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, Maxim Cournoyer writes: > So a better suggestion with the above in mind would be to package it > using the non-released 1.7-dev development branch which relies already > on qtwebengine instead of qtwebkit. > > Would you like to give it a spin? I have put this together. It doesn't crash anymore and relies on qtwebengine, but some parts of it (e.g., interactive activities) are not working properly. Not sure if that's related, but I see messages like QIODevice::read (QFile,"/gnu/store/…-openboard-1.7.0-a0255/share/openboard/library/interactivities/Dice.wgt"):device not open on stderr. Anyway, I attach the new package definition. Regards, From 862ed34a048362c2682d82c32ea8c0ec4b2d6399 Mon Sep 17 00:00:00 2001 Message-Id: <862ed34a048362c2682d82c32ea8c0ec4b2d6399.1646522108.git.mail@nicolasgoaziou.fr> From: Nicolas Goaziou Date: Sun, 6 Mar 2022 00:14:25 +0100 Subject: [PATCH v2] gnu: Add openboard. * gnu/packages/education.scm (openboard): New variable. --- gnu/packages/education.scm | 126 +++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 6fe79b99ca..891ffaf28b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -543,6 +543,132 @@ (define-public childsplay (home-page "http://www.schoolsplay.org") (license license:gpl3+))) +(define-public openboard + (let ((commit "3bd40ebe67c665950fffa4a7cee4943919f04add")) + (package + (name "openboard") + (version "1.7.0-a0255") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenBoard-org/OpenBoard") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kh2i02qgankda9ygq01bkm58fd2p6mcaddvw0ny901dg7a0qkbr")))) + (build-system qt-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-initial-values + ;; Remove useless "Check for updates" action from menu. + ;; Also prevent pop-up window about importing Open Sankore + ;; documents since we don't package OpenBoard-Importer. + (lambda _ + (substitute* "src/core/UBSettings.cpp" + (("(appHideCheckForSoftwareUpdate = .*?)false(\\);)" _ beg end) + (string-append beg "true" end)) + (("(appLookForOpenSankoreInstall = .*?)true(\\);)" _ beg 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 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/frameworks/UBPlatformUtils_linux.cpp" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) + (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/poppler") + (search-input-directory inputs "/include/poppler"))))) + (replace 'configure + (lambda _ + (invoke "qmake" "OpenBoard.pro"))) + (replace 'install + (lambda* (#:key inputs #:allow-other-keys) + (let* ((share (string-append #$output "/share")) + (openboard (string-append share "/openboard")) + (i18n (string-append openboard "/i18n"))) + ;; Install data. + (with-directory-excursion "resources" + (for-each (lambda (directory) + (let ((target + (string-append openboard "/" directory))) + (mkdir-p target) + (copy-recursively directory target))) + '("customizations" "etc" "library")) + (mkdir-p i18n) + (for-each (lambda (f) + (install-file f i18n)) + (find-files "i18n" "\\.qm$"))) + ;; Install desktop file an icon. + (install-file "resources/images/OpenBoard.png" + (string-append share + "/icons/hicolor/64x64/apps/")) + (make-desktop-entry-file + (string-append share "/applications/" #$name ".desktop") + #:name "OpenBoard" + #:comment "Interactive whiteboard application" + #:exec "openboard %f" + #:icon "OpenBoard" + #:mime-type "application/ubz" + #:categories '("Education")) + ;; Install executable. + (install-file "build/linux/release/product/OpenBoard" openboard) + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (symlink (string-append openboard "/OpenBoard") + (string-append bin "/openboard"))))))))) + (native-inputs + (list qttools)) + (inputs + (list alsa-lib + ffmpeg + freetype + lame + libass + libfdk + libressl + libtheora + libva + libvorbis + libvpx + libx264 + opus + poppler + qtbase-5 + qtdeclarative + qtmultimedia + qtsvg + qtwebchannel + qtwebengine + qtxmlpatterns + quazip-0 + sdl + zlib)) + (home-page "https://openboard.ch/") + (synopsis "Interactive whiteboard for schools and universities") + (description + "OpenBoard is a teaching software for interactive whiteboard +designed primarily for use in schools and universities. It can be +used both with interactive whiteboards or in a dual-screen setup with +a pen-tablet display and a beamer.") + (license license:gpl3)))) + (define-public omnitux (package (name "omnitux") -- 2.34.0