Package: guix-patches;
Reported by: hunter.t.joz <at> gmail.com
Date: Wed, 10 Aug 2022 20:44:01 UTC
Severity: normal
Tags: patch
Done: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57126 in the body.
You can then email your comments to 57126 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#57126; Package guix-patches.
(Wed, 10 Aug 2022 20:44:01 GMT) Full text and rfc822 format available.hunter.t.joz <at> gmail.com:guix-patches <at> gnu.org.
(Wed, 10 Aug 2022 20:44:01 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: hunter.t.joz <at> gmail.com To: guix-patches <at> gnu.org Cc: Hunter Jozwiak <hunter.t.joz <at> gmail.com> Subject: [PATCH] gnu: Add espeakup. Date: Wed, 10 Aug 2022 13:17:08 -0700
From: Hunter Jozwiak <hunter.t.joz <at> gmail.com>
* 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.scm
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 © 2017 Nikita <nikita <at> n0.is>
-;;; Copyright © 2017 Stefan Reichör <stefan <at> xsteve.at>
-;;; Copyright © 2018, 2021, 2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
-;;; Copyright © 2019 Andrew Miloradovsky <andrew <at> interpretmath.pw>
-;;; Copyright © 2020 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright ?? 2017, 2022 Nikita <nikita <at> n0.is>
+;;; Copyright ?? 2017 Stefan Reich??r <stefan <at> xsteve.at>
+;;; Copyright ?? 2018, 2021, 2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright ?? 2019 Andrew Miloradovsky <andrew <at> interpretmath.pw>
+;;; Copyright ?? 2020 Efraim Flashner <efraim <at> flashner.co.il>
+;;; copyright 2022 Hunter Jozwiak <hunter.t.joz <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,13 +22,15 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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 displays 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-" version
+ ".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="
- (assoc-ref %build-inputs "libbraille"))
- (string-append "--with-espeak_ng="
- (assoc-ref %build-inputs "espeak-ng"))
- (string-append "--with-espeak="
- (assoc-ref %build-inputs "espeak"))
- (string-append "--with-flite="
- (assoc-ref %build-inputs "flite"))
- ;; Required for RUNPATH validation.
- (string-append "LDFLAGS=-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib"))
- #:make-flags
- (list
- (string-append "JAVA_JAR_DIR="
- (assoc-ref %outputs "out"))
- (string-append "JAVA_JNI_DIR="
- (assoc-ref %outputs "out"))
- (string-append "OCAML_DESTDIR="
- (assoc-ref %outputs "out")
- "/lib")
- (string-append "PYTHON_PREFIX="
- (assoc-ref %outputs "out"))
- "PYTHON_ROOT=/"
- (string-append "TCL_DIR="
- (assoc-ref %outputs "out")
- "/lib")
- "INSTALL_WRITABLE_DIRECTORY=no-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 =")
- (string-append "extra_link_args = ['-Wl,-rpath="
- (assoc-ref outputs "out")
- "/lib'], "
- "extra_compile_args = "))))))))
- (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="
+ (assoc-ref %build-inputs
+ "libbraille"))
+ (string-append "--with-espeak_ng="
+ (assoc-ref %build-inputs
+ "espeak-ng"))
+ (string-append "--with-espeak="
+ (assoc-ref %build-inputs
+ "espeak"))
+ (string-append "--with-flite="
+ (assoc-ref
%build-inputs "flite"))
+ ;; Required for RUNPATH validation.
+ (string-append "LDFLAGS=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib"))
+ #:make-flags (list (string-append "JAVA_JAR_DIR="
+ (assoc-ref %outputs "out"))
+ (string-append "JAVA_JNI_DIR="
+ (assoc-ref %outputs "out"))
+ (string-append "OCAML_DESTDIR="
+ (assoc-ref %outputs "out") "/lib")
+ (string-append "PYTHON_PREFIX="
+ (assoc-ref %outputs "out"))
+ "PYTHON_ROOT=/"
+ (string-append "TCL_DIR="
+ (assoc-ref %outputs "out") "/lib")
+ "INSTALL_WRITABLE_DIRECTORY=no-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 =")
+ (string-append "extra_link_args = ['-Wl,-rpath="
+ (assoc-ref outputs "out") "/lib'], "
+ "extra_compile_args = "))))))))
+ (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 access
+ (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 been
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=m
+@item
+CONFIG_SPEAKUP_SOFT=m
+@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/" version
- "/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=" ,(cc-for-target)))
+ `(#:tests? #f ;no tests
+ #:make-flags (list (string-append "CC="
+ ,(cc-for-target)))
#:phases (modify-phases %standard-phases
(delete 'configure)
;; Install target in the Makefile does not work for Guix
@@ -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 PCsensor.
It works for both single pedal devices and three pedal devices. All supported
devices have vendorId:productId = 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=" ,(cc-for-target))
- (string-append "prefix=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
- (inputs
- (list libx11))
+ `(#:tests? #f ;none included
+ #:make-flags (list (string-append "CC="
+ ,(cc-for-target))
+ (string-append "prefix="
+ (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
--
2.37.1
guix-patches <at> gnu.org:bug#57126; Package guix-patches.
(Fri, 12 Aug 2022 05:45:02 GMT) Full text and rfc822 format available.Message #8 received at 57126 <at> debbugs.gnu.org (full text, mbox):
From: hunter.t.joz <at> gmail.com To: 57126 <at> debbugs.gnu.org Cc: Hunter Jozwiak <hunter.t.joz <at> gmail.com> Subject: [PATCH v2] gnu: Add espeakup. Date: Thu, 11 Aug 2022 20:39:13 -0700
From: Hunter Jozwiak <hunter.t.joz <at> gmail.com>
* gnu/packages/accessibility.scm (espeakup): New variable.
---
Fixes a bunch of problems that I didn't catch the first time around,
namely the copyright symbols being replaced with question marks. Also
moves the package definition to the end of the file.
gnu/packages/accessibility.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index 22e70b737a..43e0aa9998 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2018, 2021, 2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew <at> interpretmath.pw>
;;; Copyright © 2020 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz <at> gmail.
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,7 @@ (define-module (gnu packages accessibility)
#: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)
@@ -316,3 +318,34 @@ (define-public xmagnify
assistant for graphic designers, who need to select individual pixels.")
;; Licensed either under Expat or GPLv2+.
(license (list license:expat license:gpl2+))))
+
+(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=m
+@item
+CONFIG_SPEAKUP_SOFT=m
+@end itemize")
+ (home-page "https://github.com/williamh/espeakup")))
--
2.37.1
Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>:hunter.t.joz <at> gmail.com:Message #13 received at 57126-done <at> debbugs.gnu.org (full text, mbox):
From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> To: hunter.t.joz <at> gmail.com Cc: 57126-done <at> debbugs.gnu.org Subject: Re: [bug#57126] [PATCH v2] gnu: Add espeakup. Date: Wed, 21 Sep 2022 13:33:28 +0200
[Message part 1 (text/plain, inline)]
Hi Hunter,
On Thu, 11 Aug 2022 20:39:13 -0700
hunter.t.joz <at> gmail.com wrote:
> From: Hunter Jozwiak <hunter.t.joz <at> gmail.com>
>
> * gnu/packages/accessibility.scm (espeakup): New variable.
> ---
> Fixes a bunch of problems that I didn't catch the first time around,
> namely the copyright symbols being replaced with question marks. Also
> moves the package definition to the end of the file.
Thanks for recognizing this yourself. I pushed this as commit
e883ea89c6fa409634ed141bcbef9b39166067f9
with some minor changes (see below).
Of cause, this adds only the package to Guix, it does not create any
service for Guix System.
Björn
Changed:
;;; Copyright © 2018, 2021, 2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew <at> interpretmath.pw>
;;; Copyright © 2020 Efraim Flashner <efraim <at> flashner.co.il>
-;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz <at> gmail.
+;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -336,10 +336,10 @@ (define-public espeakup
(native-inputs (list pkg-config))
(inputs (list espeak-ng alsa-lib))
(license license:gpl3+)
- (synopsis "A bridge for espeak and speakup")
+ (synopsis "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.
+the Linux kernel and the espeak-ng text to speach synthesizer.
In order for this package to work, you need to have the following
kernel modules built:
@itemize @bullet
@@ -348,4 +348,4 @@ (define-public espeakup
@item
CONFIG_SPEAKUP_SOFT=m
@end itemize")
- (home-page "https://github.com/williamh/espeakup")))
+ (home-page "ttps://github.com/linux-speakup/espeakup")))
[Message part 2 (application/pgp-signature, inline)]
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 20 Oct 2022 11:24:04 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.