From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qI+YFsEc9GLOdAAAbAwnHQ (envelope-from ) for ; Wed, 10 Aug 2022 23:01:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id aNaHFsEc9GITbgAAauVa8A (envelope-from ) for ; Wed, 10 Aug 2022 23:01:53 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C96303D91 for ; Wed, 10 Aug 2022 23:01:52 +0200 (CEST) Received: from localhost ([::1]:53698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLspq-0000bh-DM for larch@yhetil.org; Wed, 10 Aug 2022 17:01:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLsYc-00022j-8W for guix-patches@gnu.org; Wed, 10 Aug 2022 16:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLsYb-0000VG-Vs for guix-patches@gnu.org; Wed, 10 Aug 2022 16:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLsYb-000727-RY for guix-patches@gnu.org; Wed, 10 Aug 2022 16:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57126] [PATCH] gnu: Add espeakup. Resent-From: hunter.t.joz@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 20:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57126@debbugs.gnu.org Cc: Hunter Jozwiak X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166016422527004 (code B ref -1); Wed, 10 Aug 2022 20:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2022 20:43:45 +0000 Received: from localhost ([127.0.0.1]:50867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLsYH-00071P-PY for submit@debbugs.gnu.org; Wed, 10 Aug 2022 16:43:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:46912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLs8f-0006Nb-9m for submit@debbugs.gnu.org; Wed, 10 Aug 2022 16:17:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLs8e-0007L6-US for guix-patches@gnu.org; Wed, 10 Aug 2022 16:17:13 -0400 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]:40678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLs8c-0004kz-Ix for guix-patches@gnu.org; Wed, 10 Aug 2022 16:17:12 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-10ea7d8fbf7so19096150fac.7 for ; Wed, 10 Aug 2022 13:17:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date :mime-version:from:from:to:cc; bh=22IXX03xTHggOjqybJKCckisUMMO8bZwhGL4bNC/+zw=; b=Ps2cKtBwKj+BWABzXCScKWBL5VniRoJVoz+cD5iym5IrEZKC6OpKkjPXcapJdtl27i mx0b9jeowG42FRdWK6hOGKVsUSQQop248X4vvK6PCBt2lejQxVQIzA8y023swIQaTbYc p2RxQ4BDyE4PzuAsBLhhZC5tlv/ycOMVsvh/KcWMKU1uX7AiC+jA/3BuSFTYOYzrtcEZ WA3CHrgCerb5X3vL8WzrZfPfnwE3zdiU34Db2Crfqw8K3cevvHQ7rsvsfwWe45OzuONO LOIu+e5sddZXU2LApFx6B8t0vgN3teIpGc3IYAXR5KzP16USXAvloLVnd/ZrmVZQ270v Zbnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date :mime-version:from:x-gm-message-state:from:to:cc; bh=22IXX03xTHggOjqybJKCckisUMMO8bZwhGL4bNC/+zw=; b=KBRCcqTRy5jQeKjIbPAmj1Mt7CNJ/ZagEjXx3uH9qR4cUFHlm8Dh3HCEnzCxaIuG3B xOQdKoAv3KMIDAyaDdjKCc8leQEZE2pH+h1YV4qC7GUFPsBqD2dMnwWOGBy5wK+3kpw4 VxFa3nFOyfEaa2rxnTjpc/PA5qa5t+Y/FUXcjDdchur+wOix/aHMoNnQfgrOiHqWuM9U pt90ps7quha/OClwMOSfSwlbeDqUwkcvFTyjDTELGAjeLIgcYTHu8hL2cCWA1SzdiTOP 9owuBfzt25bi5T5A7TApBNTmTOLFwBWFFoix8CLnNv/OOxiocSAbqdSY+LKS2jwCxefG KfFA== X-Gm-Message-State: ACgBeo1kQWgvjPQgoJdA1mX1/pkOkN+TMkPkVZ0BhgdMsBp4PgxSFwvd /XKqKsOOu6Q14TGoyYfoUFvqb0GrZwnp/xgY5Lg4Q/+IXWU= X-Google-Smtp-Source: AA6agR7CsmkWySdEzjHLkx+fzGTFCONfYpedHYnKV2K4fTH/leTNxYZmOJ5j23NlUD4oWCnn9HafPpA3UBGfxYEHPsU= X-Received: by 2002:a05:6870:d78a:b0:10e:45a6:a400 with SMTP id bd10-20020a056870d78a00b0010e45a6a400mr2213531oab.27.1660162628542; Wed, 10 Aug 2022 13:17:08 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Wed, 10 Aug 2022 13:17:08 -0700 From: hunter.t.joz@gmail.com X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Date: Wed, 10 Aug 2022 13:17:08 -0700 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2001:4860:4864:20::2c; envelope-from=hunter.t.joz@gmail.com; helo=mail-oa1-x2c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 10 Aug 2022 16:43:40 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 10 Aug 2022 17:01:29 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660165313; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=22IXX03xTHggOjqybJKCckisUMMO8bZwhGL4bNC/+zw=; b=aTnROBCTxVHNUpVoTtEz3zzQY7YvsZbtXVkFAuCHPHyR5eqfGa0WM/0F2UwxHEuFghj/2H j0yKbYMmZyXZJY4QgeNFCQz6/opKpf5tzLeUytzYwKGJceXXQQJsdYLaE6LaQyv3NvRmZL jeB2VrJcfFDHtzMtLYE42BYNEXbOdSziqrAWkKaVrY0nKJRiLMK7abiWcmyGs9SdDQqCEi 9B8BT2YS3hkRLsEs0WMCS/XK3Ot/oKCztETNUrNP3U0hsEC/XyEzTgn/19cgbJOe4Mga2L G4D8K9VPKlkdy4+xJjlR3z+1L2EdOTwmipIFn3hPD2tuOKRtdaMLQNKz3cy4iw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660165313; a=rsa-sha256; cv=none; b=AvcUQCddr6ZReTGUxk8sK57zmTPPk2WIzfVjF/Rtq/CXHDvJWNkHFq1RwTdUaw8tAVtONw 76ZbD6CTGnWyKjslqKvGkEW8ZqnlGgPSi3yE2Ll6ZGKE+ZXukaDIqCNR+pKPur3NqYea70 lwOcdiIRCo/KAlxqKtqjCtuFjJTkZNU5lfSVLo5kmAv2YXHpT9uQJwqsc8dtvD4Ep7PQTq NovhKhE70LYCIxn8IIHQ34ArwS4qUh8nnruVCcPmugqGgb89s4/eb41R5xT34v9RnqOUKU Skr9+9OmfjLfM9ehxL0lORx3E0AwBC/l4lAm3pet3P8kAIQJStCB+NdLAftYnA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ps2cKtBw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.62 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ps2cKtBw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C96303D91 X-Spam-Score: 6.62 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8z7AJCJ6IiCo From: Hunter Jozwiak * gnu/packages/accessibility.scm (espeakup): New variable. --- gnu/packages/accessibility.scm | 343 ++++++++++++++++++--------------- 1 file changed, 184 insertions(+), 159 deletions(-) diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.sc= m index 22e70b737a..eb49927c4d 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2017 Nikita -;;; Copyright =C2=A9 2017 Stefan Reich=C3=B6r -;;; Copyright =C2=A9 2018, 2021, 2022 Tobias Geerinckx-Rice -;;; Copyright =C2=A9 2019 Andrew Miloradovsky -;;; Copyright =C2=A9 2020 Efraim Flashner +;;; Copyright ?? 2017, 2022 Nikita +;;; Copyright ?? 2017 Stefan Reich??r +;;; Copyright ?? 2018, 2021, 2022 Tobias Geerinckx-Rice +;;; Copyright ?? 2019 Andrew Miloradovsky +;;; Copyright ?? 2020 Efraim Flashner +;;; copyright 2022 Hunter Jozwiak ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,13 +22,15 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages accessibility) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages lisp) #:use-module (gnu packages ocaml) @@ -60,28 +63,34 @@ (define-public libbraille (package (name "libbraille") (version "0.19.0") - (source - (origin - (method url-fetch) - (uri - (string-append "https://sourceforge.net/projects/" name "/files/" name "/" - name "-" version "/" name "-" version ".tar.gz")) - (sha256 - (base32 "05g8r0ypazqn10i7k48iibs8bzc3scdfcnhcykab8j16lhzd27d0")))) + (source (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/" + name + "/files/" + name + "/" + name + "-" + version + "/" + name + "-" + version + ".tar.gz")) + (sha256 + (base32 + "05g8r0ypazqn10i7k48iibs8bzc3scdfcnhcykab8j16lhzd27d0")))) (build-system glib-or-gtk-build-system) (outputs '("out" "bin")) (arguments - `(#:tests? #f ; Tests require drivers - #:configure-flags - (list - "--disable-static" - "--enable-fake"))) - (native-inputs - (list latex2html pkg-config python-wrapper swig)) - (inputs - (list glib gtk+-2 libusb-compat)) + `(#:tests? #f ;Tests require drivers + #:configure-flags (list "--disable-static" "--enable-fake"))) + (native-inputs (list latex2html pkg-config python-wrapper swig)) + (inputs (list glib gtk+-2 libusb-compat)) (synopsis "Portable Braille Library") - (description "Libbraille is a library to easily access Braille display= s and + (description + "Libbraille is a library to easily access Braille displays and terminals.") (home-page "https://libbraille.org") (license license:lgpl2.1+))) @@ -90,143 +99,162 @@ (define-public brltty (package (name "brltty") (version "6.5") - (source - (origin - (method url-fetch) - (uri - (string-append "https://brltty.app/archive/brltty-" version ".tar.= gz")) - (sha256 - (base32 "1h62xzd5k0aaq2k4v3w93rizxnb8psvkxrlx62wr08ybwpspgp7z")))) + (source (origin + (method url-fetch) + (uri (string-append "https://brltty.app/archive/brltty-" ver= sion + ".tar.gz")) + (sha256 + (base32 + "1h62xzd5k0aaq2k4v3w93rizxnb8psvkxrlx62wr08ybwpspgp7z")))) (build-system glib-or-gtk-build-system) (arguments - `(#:tests? #f ; No target - + `(#:tests? #f ;No target + ;; High parallelism may cause errors such as: - ;; ranlib: ./libbrlapi_stubs.a: error reading brlapi_stubs.o: file truncated + ;; ranlib: ./libbrlapi_stubs.a: error reading brlapi_stubs.o: file truncated #:parallel-build? #f - #:configure-flags - (list - (string-append "--with-libbraille=3D" - (assoc-ref %build-inputs "libbraille")) - (string-append "--with-espeak_ng=3D" - (assoc-ref %build-inputs "espeak-ng")) - (string-append "--with-espeak=3D" - (assoc-ref %build-inputs "espeak")) - (string-append "--with-flite=3D" - (assoc-ref %build-inputs "flite")) - ;; Required for RUNPATH validation. - (string-append "LDFLAGS=3D-Wl,-rpath=3D" - (assoc-ref %outputs "out") - "/lib")) - #:make-flags - (list - (string-append "JAVA_JAR_DIR=3D" - (assoc-ref %outputs "out")) - (string-append "JAVA_JNI_DIR=3D" - (assoc-ref %outputs "out")) - (string-append "OCAML_DESTDIR=3D" - (assoc-ref %outputs "out") - "/lib") - (string-append "PYTHON_PREFIX=3D" - (assoc-ref %outputs "out")) - "PYTHON_ROOT=3D/" - (string-append "TCL_DIR=3D" - (assoc-ref %outputs "out") - "/lib") - "INSTALL_WRITABLE_DIRECTORY=3Dno-thanks") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-errors - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "configure" - (("/sbin/ldconfig") - (which "true"))) - ;; Make Python bindings use rpath. - (substitute* "Bindings/Python/setup.py.in" - (("extra_compile_args =3D") - (string-append "extra_link_args =3D ['-Wl,-rpath=3D" - (assoc-ref outputs "out") - "/lib'], " - "extra_compile_args =3D ")))))))) - (native-inputs - (list clisp - python-cython - doxygen - gettext-minimal - `(,icedtea "jdk") - ;; ("linuxdoc" ,linuxdoc-tools) - ocaml - ocaml-findlib - pkg-config - python-wrapper - tcl)) - (inputs - (list alsa-lib - at-spi2-core - bluez - dbus - espeak - espeak-ng - expat - festival - flite - glib - gpm - icu4c - libbraille - pcre2 - liblouis - ncurses - polkit - speech-dispatcher - util-linux - `(,util-linux "lib") - libx11 - libxaw - libxaw3d - libxext - libxfixes - libxt - libxtst)) + #:configure-flags (list (string-append "--with-libbraille=3D" + (assoc-ref %build-inputs + "libbraille")) + (string-append "--with-espeak_ng=3D" + (assoc-ref %build-inputs + "espeak-ng")) + (string-append "--with-espeak=3D" + (assoc-ref %build-inputs + "espeak")) + (string-append "--with-flite=3D" + (assoc-ref %build-inputs "flite")) + ;; Required for RUNPATH validation. + (string-append "LDFLAGS=3D-Wl,-rpath=3D" + (assoc-ref %outputs "out") + "/lib")) + #:make-flags (list (string-append "JAVA_JAR_DIR=3D" + (assoc-ref %outputs "out")) + (string-append "JAVA_JNI_DIR=3D" + (assoc-ref %outputs "out")) + (string-append "OCAML_DESTDIR=3D" + (assoc-ref %outputs "out") "/lib"= ) + (string-append "PYTHON_PREFIX=3D" + (assoc-ref %outputs "out")) + "PYTHON_ROOT=3D/" + (string-append "TCL_DIR=3D" + (assoc-ref %outputs "out") "/lib"= ) + "INSTALL_WRITABLE_DIRECTORY=3Dno-thanks") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-errors + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "configure" + (("/sbin/ldconfig") + (which "true"))) + ;; Make Python bindings use rpath. + (substitute* "Bindings/Python/setup.py.in" + (("extra_compile_args =3D") + (string-append "extra_link_args =3D ['-Wl,-rpath= =3D" + (assoc-ref outputs "out") "/lib'],= " + "extra_compile_args =3D ")))))))) + (native-inputs (list clisp + python-cython + doxygen + gettext-minimal + `(,icedtea "jdk") + ;; ("linuxdoc" ,linuxdoc-tools) + ocaml + ocaml-findlib + pkg-config + python-wrapper + tcl)) + (inputs (list alsa-lib + at-spi2-core + bluez + dbus + espeak + espeak-ng + expat + festival + flite + glib + gpm + icu4c + libbraille + pcre2 + liblouis + ncurses + polkit + speech-dispatcher + util-linux + `(,util-linux "lib") + libx11 + libxaw + libxaw3d + libxext + libxfixes + libxt + libxtst)) (synopsis "Braille TTY") - (description "BRLTTY is a background process (daemon) which provides a= ccess + (description + "BRLTTY is a background process (daemon) which provides access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display, and provides complete screen review functionality. Some speech capability has also bee= n incorporated.") (home-page "https://brltty.app/") (license license:lgpl2.1+))) +(define-public espeakup + (package + (name "espeakup") + (version "0.90") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linux-speakup/espeakup") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lmjwafvfxy07zn18v3dzjwwpnid2xffgvy2dzlwkbns8gb60ds2")))) + (build-system meson-build-system) + (native-inputs (list pkg-config)) + (inputs (list espeak-ng alsa-lib)) + (license license:gpl3+) + (synopsis "A bridge for espeak and speakup") + (description + "Espeakup is a bridge between the speakup driver implemented in the Linux kernel and the espeak-ng text to synthesizer. + +In order for this package to work, you need to have the following kernel modules built: +@itemize @bullet +@item +CONFIG_SPEAKUP=3Dm +@item +CONFIG_SPEAKUP_SOFT=3Dm +@end itemize") + (home-page "https://github.com/williamh/espeakup"))) (define-public florence (package (name "florence") (version "0.6.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/florence/florence/" versi= on - "/florence-" version ".tar.bz2")) - (sha256 - (base32 - "07h9qm22krlwayhzvc391lr23vicw81s48g7rirvx1fj0zyr4aa2")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/florence/florence/= " + version "/florence-" version ".tar.bz2")= ) + (sha256 + (base32 + "07h9qm22krlwayhzvc391lr23vicw81s48g7rirvx1fj0zyr4aa2")))) (build-system glib-or-gtk-build-system) (arguments - `(#:configure-flags (list "--with-xtst" - "--without-docs" + `(#:configure-flags (list "--with-xtst" "--without-docs" "--with-notification"))) - (inputs - (list libxml2 - libglade - librsvg - gstreamer - cairo - gtk+ - libxtst - libxcomposite - libnotify)) - (native-inputs - (list gettext-minimal intltool pkg-config)) + (inputs (list libxml2 + libglade + librsvg + gstreamer + cairo + gtk+ + libxtst + libxcomposite + libnotify)) + (native-inputs (list gettext-minimal intltool pkg-config)) (home-page "http://florence.sourceforge.net/") (synopsis "Extensible, scalable virtual keyboard for X11") (description @@ -258,13 +286,12 @@ (define-public footswitch (base32 "14pyzc4ws1mj859xs9n4x83wzxxvd3bh5bdxzr6nv267xwx1mq68"))= )) (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list hidapi)) + (native-inputs (list pkg-config)) + (inputs (list hidapi)) (arguments - `(#:tests? #f ; no tests - #:make-flags (list (string-append "CC=3D" ,(cc-for-target))) + `(#:tests? #f ;no tests + #:make-flags (list (string-append "CC=3D" + ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ;; Install target in the Makefile does not work for Gu= ix @@ -273,15 +300,14 @@ (define-public footswitch (let ((bin (string-append (assoc-ref outputs "out"= ) "/bin"))) (install-file "footswitch" bin) - (install-file "scythe" bin) - #t)))))) + (install-file "scythe" bin) #t)))))) (home-page "https://github.com/rgerganov/footswitch") (synopsis "Command line utility for PCsensor foot switch") (description "Command line utility for programming foot switches sold by PCsenso= r. It works for both single pedal devices and three pedal devices. All suppo= rted devices have vendorId:productId =3D 0c45:7403 or 0c45:7404.") - (license license:expat)))) + (license license:expat)))) (define-public xmagnify (package @@ -298,15 +324,14 @@ (define-public xmagnify "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; none included - #:make-flags - (list (string-append "CC=3D" ,(cc-for-target)) - (string-append "prefix=3D" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (inputs - (list libx11)) + `(#:tests? #f ;none included + #:make-flags (list (string-append "CC=3D" + ,(cc-for-target)) + (string-append "prefix=3D" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (inputs (list libx11)) (home-page "https://gitlab.com/amiloradovsky/magnify") (synopsis "Tiny screen magnifier for X11") (description --=20 2.37.1