Merge branch 'yianiris-master-patch-36588' into 'master'

upgrel: 6.3-3 icu compatibility rebuild See merge request pkg/obextra/brltty!1

Merge branch 'yianiris-master-patch-36588' into 'master'
b21d8eb8 · Eric Vidal · ba40c8f4 · 973130ac · b21d8eb8 · b21d8eb8
Commit b21d8eb8 authored 3 years ago by Eric Vidal
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
 # Obarun        : 66 init/supervisor
 # Maintainer    : Eric Vidal <eric@obarun.org>
 # Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
+# Maintainer	: YianIris <yianiris At disroot Dot org>
 # Obarun PkgSrc : url="https://framagit.org/pkg/obextra/brltty"
 #----------------
 # Maintainer    :
@@ -16,7 +17,7 @@ pkgname=brltty
 pkgdesc="Braille display driver for Linux/Unix"

 pkgver=6.3
-pkgrel=2
+pkgrel=3

 url="https://brltty.app"

@@ -146,12 +147,14 @@ provides=('libbrlapi.so')

 #--SECURITY AND LICENCE------------------------------------------------------

-sha512sums=('a27236fc6211dfe1b9867871eca475a5c82471ea10c1bc3006916f9420764c6f91d5f2cfc5c44c6c76f1120f3ef21c821ca9a804d81ebcad6ecad886c2ef84ad'
-            'cc2e2d5f33d4e11d6ff828aefc0773ccdc02127ce2f00649c1e3f8d4b39b90789f4a0e41385b344f850c38bd4a1df36d3d9d413a59144d431defdd343633f800'
-            'a530fe66983768f9dc544af01c586abc101dfa2ed76885b4f1fd78c483b59e8445f2c0dbbfb865dd1cf2874342c346bd35ce978ab246e9cdd31d2d489a14e770')
-b2sums=('ed3744173f59c85ac9e2bdef45e65dc98d178e51332f2fc0903763067c0f9a6a806c60989a36c825baa3dbdd1ed0629395318c22134413aa27791e17b3398413'
-        'e6b7453360ef92254ff1049b387c9ee45f3be0e0259c9c3670154938f61ec4142b2de330401d09e1290ed9ffe8e390ede3472dab0e2f4c69b497f9ac19795aad'
-        '59f50e367d2e6c6704902ebbd254232aa17c741c9a43ba27d0ebaa5fd4a86f62bc8bdd08e8e4562437dea0efa9d49845e40c022b8c4d7110675d81bf63ac4df4')
+sha512sums=(
+'687fbb30703d4c9fd7b55d27fabecf26c58f7c032c82bcdee1405259da74f85516e268fc49d1bdb2f704b92532cf5c466712cc09b1a4ba5304d4e021af74b7b8'
+'9314f62a3fece6a740a23d9d0c469b2bad42bd5fd0e03a092e9ee1c4b97b007f7f6460b6364c4d3e6365b4abfb3bcfef25e77623f6f1dd9d5b9cec8fc4dfacec'
+'a8daae34eaeafc9cd655f8f0a95c54976192348250d7aa3ee2653ce9f5de74541005dd9d456bc5b28c1f704f8aa40d3cb8787b999c17f60248492d42fd288a64')

+b2sumd=(
+'c321e1bdd6d7956620fa354edcf8eee0c8a0011ebfabb4cff98cb5a22c23d5667e6b73cbdbf282c9c36cc4d50ded4e147174c45da36e3fec03cc0a8d2121459a'
+'72be23cdd85433c051dd8a7163ae9434d5eef2bd34a110dd9986ce01511f513b5651f6a2be70c95d374734fee1bc496c5f07453e0716d7ec13301f563575ed60'
+'d979f2667d5e88eaa216701c5bd4eafcbd80e996ec120aa3d2e1d13808b3274b74e530ecba1395bf1401cdbc265597764f9cd2e78f4cb0aa69ad5d25d041a8b2')

 license=('LGPL2.1')
--- a/version/6.3-3/LICENSE
+++ b/version/6.3-3/LICENSE
+Copyright (c) 2015-2020 Eric Vidal <eric@obarun.org>
+Copyright (c) 2015-2020 Jean-Michel T.Dydak <jean-michel@obarun.org>
+All rights reserved.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/version/6.3-3/PKGBUILD
+++ b/version/6.3-3/PKGBUILD
+# Obarun        : 66 init/supervisor
+# Maintainer    : Eric Vidal <eric@obarun.org>
+# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
+# Maintainer	: YianIris <yianiris At disroot Dot org>
+# Obarun PkgSrc : url="https://framagit.org/pkg/obextra/brltty"
+#----------------
+# Maintainer    :
+# Contributor   :
+# Arch PkgSrc   : url="https://www.archlinux.org/packages/extra/x86_64/brltty/"
+#----------------
+# Website       : https://brltty.app
+#----------------------------------------------------------------------------
+#--DESCRIPTION---------------------------------------------------------------
+
+pkgname=brltty
+
+pkgdesc="Braille display driver for Linux/Unix"
+
+pkgver=6.3
+pkgrel=3
+
+url="https://brltty.app"
+
+target="${pkgname}-${pkgver}.tar.bz2"
+source=("https://brltty.app/archive/${target}"
+        'brltty.sysusers'
+        'brltty.tmpfiles')
+
+#--BUILD CONFIGURATION-------------------------------------------------------
+
+options=('!emptydirs')
+
+makedepends=(
+    'alsa-lib'
+    'at-spi2-atk'
+    'at-spi2-core'
+    'atk'
+    'cython'
+    'dbus'
+    'espeak-ng'
+    'expat'
+    'festival'
+    'glib2'
+    'gpm'
+    'icu'
+    'java-environment'
+    'libxaw'
+    'ncurses'
+    'ocaml-ctypes'
+    'ocaml-findlib'
+    'speech-dispatcher'
+    'flite')
+
+#--BUILD PREPARATION---------------------------------------------------------
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  ./autogen
+}
+
+
+#--BUILD CONTROL-------------------------------------------------------------
+
+path=(
+    '--prefix=/usr'
+    '--sysconfdir=/etc'
+    '--localstatedir=/var'
+    '--mandir=/usr/share/man'
+    '--with-scripts-directory=/usr/lib/brltty')
+
+flags=(
+    '--with-tables-directory=/usr/share/brltty'
+    '--with-writable-directory=/run/brltty'
+    '--enable-gpm'
+    '--disable-stripping'
+    '--with-flite-voice=cmu_us_kal16')
+
+#--BUILD---------------------------------------------------------------------
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  ./configure ${path[@]} ${flags[@]}
+
+  make
+}
+
+
+#--PACKAGE-------------------------------------------------------------------
+
+package() {
+    depends+=(
+        'libasound.so'
+        'libdbus-1.so'
+        'libexpat.so'
+        'libgio-2.0.so'
+        'libglib-2.0.so'
+        'libgobject-2.0.so'
+        'libicuuc.so'
+        'libgpm.so'
+        'libncursesw.so')
+
+    cd "${pkgname}-${pkgver}"
+
+    make INSTALL_ROOT="${pkgdir}" install
+
+    make INSTALL_ROOT="${pkgdir}" install -C Autostart/Udev
+
+    install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
+
+    install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+
+    install -vDm 644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+}
+
+#--INSTALL CONFIGURATION-----------------------------------------------------
+
+arch=('x86_64')
+
+backup=(etc/brltty.conf)
+
+depends=(
+    'bluez-libs'
+    'gcc-libs'
+    'glibc'
+    'liblouis'
+    'libspeechd'
+    'pcre'
+    'polkit'
+    'tcl')
+
+optdepends=('at-spi2-core: X11/GNOME Apps accessibility'
+            'atk: ATK bridge for X11/GNOME accessibility'
+            'espeak-ng: espeak-ng driver'
+            'java-runtime: Java support'
+            'libxaw: X11 support'
+            'libxt: X11 support'
+            'libx11: for xbrlapi'
+            'libxfixes: for xbrlapi'
+            'libxtst: for xbrlapi'
+            'ocaml: OCaml support'
+            'python: Python support'
+            'speech-dispatcher: speech-dispatcher driver')
+
+
+provides=('libbrlapi.so')
+
+
+#--SECURITY AND LICENCE------------------------------------------------------
+
+sha512sums=(
+'687fbb30703d4c9fd7b55d27fabecf26c58f7c032c82bcdee1405259da74f85516e268fc49d1bdb2f704b92532cf5c466712cc09b1a4ba5304d4e021af74b7b8'
+'9314f62a3fece6a740a23d9d0c469b2bad42bd5fd0e03a092e9ee1c4b97b007f7f6460b6364c4d3e6365b4abfb3bcfef25e77623f6f1dd9d5b9cec8fc4dfacec'
+'a8daae34eaeafc9cd655f8f0a95c54976192348250d7aa3ee2653ce9f5de74541005dd9d456bc5b28c1f704f8aa40d3cb8787b999c17f60248492d42fd288a64')
+
+b2sumd=(
+'c321e1bdd6d7956620fa354edcf8eee0c8a0011ebfabb4cff98cb5a22c23d5667e6b73cbdbf282c9c36cc4d50ded4e147174c45da36e3fec03cc0a8d2121459a'
+'72be23cdd85433c051dd8a7163ae9434d5eef2bd34a110dd9986ce01511f513b5651f6a2be70c95d374734fee1bc496c5f07453e0716d7ec13301f563575ed60'
+'d979f2667d5e88eaa216701c5bd4eafcbd80e996ec120aa3d2e1d13808b3274b74e530ecba1395bf1401cdbc265597764f9cd2e78f4cb0aa69ad5d25d041a8b2')
+
+license=('LGPL2.1')
--- a/version/6.3-3/brltty.install
+++ b/version/6.3-3/brltty.install
+post_install () {
+  [ ! -e /etc/brlapi.key ] && brltty-genkey
+  echo "Please add your user to the brlapi group."
+}
+
+post_upgrade () {
+  post_install
+}
+
+post_remove() {
+  [ -e /etc/brlapi.key ] && rm -v /etc/brlapi.key
+}
--- a/version/6.3-3/brltty.sysusers
+++ b/version/6.3-3/brltty.sysusers
+###############################################################################
+# BRLTTY - A background process providing access to the console screen (when in
+#          text mode) for a blind person using a refreshable braille display.
+#
+# Copyright (C) 1995-2020 by The BRLTTY Developers.
+#
+# BRLTTY comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the
+# GNU Lesser General Public License, as published by the Free Software
+# Foundation; either version 2.1 of the License, or (at your option) any
+# later version. Please see the file LICENSE-LGPL for details.
+#
+# Web Page: http://brltty.app/
+#
+# This software is maintained by Dave Mielke <dave@mielke.cc>.
+###############################################################################
+
+################################################
+# keep these synchronized with brltty@.service #
+################################################
+
+u brltty - "Braille Device Daemon" /var/lib/brltty
+
+# for reading screen content (/dev/vcs*)
+# for virtual console monitoring and control (/dev/tty<n>)
+m brltty tty
+
+# for serial I/O (/dev/ttyS<n>)
+# probably only one of these should be uncommented
+# m brltty dialout
+m brltty uucp
+
+# for USB I/o (/dev/bus/usb/*/*)
+# for creating virtual devices (/dev/uinput)
+m brltty root
+
+# for playing sound via the ALSA framework
+m brltty audio
+
+# for playing sound via the Pulse Audio daemon
+# m brltty pulse-access
+
+# for monitoring keyboard input (/dev/input/*)
+m brltty input
+
+# for reading the BrlAPI authorization key file
+m brltty brlapi
+
--- a/version/6.3-3/brltty.tmpfiles
+++ b/version/6.3-3/brltty.tmpfiles
+# BRLTTY's runtime directory
+d /run/brltty 0750 brltty brltty
+
+# BRLTTY's local state directory
+d /var/lib/brltty 2770 brltty brltty
+
+# BrlAPI's sockets directory
+d /var/lib/BrlAPI 3777 brltty brltty
+
+# BrlAPI's authorization key file
+z /etc/brlapi.key 0640 root brlapi