[arch-commits] Commit in brltty/repos/testing-x86_64 (7 files)
David Runge
dvzrv at gemini.archlinux.org
Tue Dec 28 19:37:54 UTC 2021
Date: Tuesday, December 28, 2021 @ 19:37:54
Author: dvzrv
Revision: 433227
archrelease: copy trunk to testing-x86_64
Added:
brltty/repos/testing-x86_64/PKGBUILD
(from rev 433226, brltty/trunk/PKGBUILD)
brltty/repos/testing-x86_64/brltty-6.2-systemd_sysusers_groups.patch
(from rev 433226, brltty/trunk/brltty-6.2-systemd_sysusers_groups.patch)
brltty/repos/testing-x86_64/brltty-6.4-x11_autostart.patch
(from rev 433226, brltty/trunk/brltty-6.4-x11_autostart.patch)
brltty/repos/testing-x86_64/brltty.install
(from rev 433226, brltty/trunk/brltty.install)
Deleted:
brltty/repos/testing-x86_64/PKGBUILD
brltty/repos/testing-x86_64/brltty-6.2-systemd_sysusers_groups.patch
brltty/repos/testing-x86_64/brltty.install
------------------------------------------+
PKGBUILD | 166 ++++++++++++++---------------
brltty-6.2-systemd_sysusers_groups.patch | 92 ++++++++--------
brltty-6.4-x11_autostart.patch | 24 ++++
brltty.install | 24 ++--
4 files changed, 167 insertions(+), 139 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-28 19:37:44 UTC (rev 433226)
+++ PKGBUILD 2021-12-28 19:37:54 UTC (rev 433227)
@@ -1,81 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Alexander Epaneshnikov <aarnaarn2 at gmail.com>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=brltty
-pkgver=6.4
-pkgrel=5
-pkgdesc="Braille display driver for Linux/Unix"
-arch=(x86_64)
-url="https://brltty.app"
-license=(LGPL2.1)
-depends=(bluez-libs gcc-libs glibc liblouis libspeechd pcre2 polkit tcl)
-makedepends=(alsa-lib at-spi2-atk at-spi2-core atk cython dbus dracut espeak-ng
-expat festival glib2 gpm icu java-environment libxaw ncurses ocaml-ctypes
-ocaml-findlib speech-dispatcher systemd-libs)
-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)
-backup=(etc/brltty.conf)
-options=(!emptydirs)
-install=brltty.install
-source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2"
- "${pkgname}-6.2-systemd_sysusers_groups.patch"
-)
-sha512sums=('58394c18d56a2a93a44be1c5dcfd02613581820ea2d2dbd945372ea11e066a18a75832ea04f09cf7f411e6dd1cd4ec78574f317dafcbc5c431dcf0db21b93690'
- '32ba91271e2247b4a330cd213ed75b591268cb99a79c2efd9ae675804faee027c6b2f782768cb2329a65fc914ca2400b2901f35ce1fc2522c6691b343799eb02')
-b2sums=('2c31b8282f0bc4730e406772c8b5aa72b1650e3290cfe967ec668394627440f84afe936bfbdbdab9ee0e7ba93ef466950295dbd7d979b639605fe619b5c170bd'
- '036e36d558594bb06af1eb41ff5fc9ae52ccf4bad54556c3f4f81a5e2f31f574039835e5e756455527c327a73d563a3db54a9f32e3478545a2a22c2725aaeee2')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- patch -Np1 -i ../"${pkgname}-6.2-systemd_sysusers_groups.patch"
- ./autogen
-}
-
-build() {
- # fat-lto-objects is required for non-mangled .a files in libelf
- CFLAGS+=" -ffat-lto-objects"
- cd "${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --with-scripts-directory=/usr/lib/brltty \
- --with-tables-directory=/usr/share/brltty \
- --with-writable-directory=/run/brltty \
- --enable-gpm \
- --disable-stripping
- make
-}
-
-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 libsystemd.so)
-
- cd "${pkgname}-${pkgver}"
- make INSTALL_ROOT="${pkgdir}" install
- make INSTALL_ROOT="${pkgdir}" install-systemd
- make INSTALL_ROOT="${pkgdir}" install-udev
- # dracut support may still be problematic
- # https://bugs.archlinux.org/task/69424
- # https://bugs.archlinux.org/task/69440
- make INSTALL_ROOT="${pkgdir}" install-dracut
- make INSTALL_ROOT="${pkgdir}" install-polkit
- install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
-
- # fix directory permission and ownership
- install -vdm 750 -o root -g 102 "$pkgdir/usr/share/polkit-1/rules.d"
-}
Copied: brltty/repos/testing-x86_64/PKGBUILD (from rev 433226, brltty/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-28 19:37:54 UTC (rev 433227)
@@ -0,0 +1,85 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Alexander Epaneshnikov <aarnaarn2 at gmail.com>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=brltty
+pkgver=6.4
+pkgrel=6
+pkgdesc="Braille display driver for Linux/Unix"
+arch=(x86_64)
+url="https://brltty.app"
+license=(LGPL2.1)
+depends=(bluez-libs gcc-libs glibc liblouis libspeechd pcre2 polkit)
+makedepends=(alsa-lib at-spi2-atk at-spi2-core atk cython dbus dracut espeak-ng
+expat festival glib2 gpm icu java-environment libxaw ncurses ocaml-ctypes
+ocaml-findlib speech-dispatcher systemd-libs 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'
+ 'tcl: tcl support'
+)
+provides=(libbrlapi.so)
+backup=(etc/brltty.conf)
+options=(!emptydirs)
+install=brltty.install
+source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2"
+ "${pkgname}-6.2-systemd_sysusers_groups.patch"
+ "${pkgname}-6.4-x11_autostart.patch"
+)
+sha512sums=('58394c18d56a2a93a44be1c5dcfd02613581820ea2d2dbd945372ea11e066a18a75832ea04f09cf7f411e6dd1cd4ec78574f317dafcbc5c431dcf0db21b93690'
+ '32ba91271e2247b4a330cd213ed75b591268cb99a79c2efd9ae675804faee027c6b2f782768cb2329a65fc914ca2400b2901f35ce1fc2522c6691b343799eb02'
+ '4871512affefbc178f4204a1b285fc2b5a05ea2d181163195d695b760e9729b3d2d00b5f052abd71379df609c3859d7cbd64128bdefd16e898bbc4368500a9a0')
+b2sums=('2c31b8282f0bc4730e406772c8b5aa72b1650e3290cfe967ec668394627440f84afe936bfbdbdab9ee0e7ba93ef466950295dbd7d979b639605fe619b5c170bd'
+ '036e36d558594bb06af1eb41ff5fc9ae52ccf4bad54556c3f4f81a5e2f31f574039835e5e756455527c327a73d563a3db54a9f32e3478545a2a22c2725aaeee2'
+ '4ebc07a725ef8362233a83118e93901e78943e8dae08f9358b668ff13ab88a65eb9e87c49d106a8c3d87eb62007b230e199107eacb01f92dc683335076c01309')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i ../"${pkgname}-6.2-systemd_sysusers_groups.patch"
+ patch -Np1 -i ../"${pkgname}-6.4-x11_autostart.patch"
+ ./autogen
+}
+
+build() {
+ # fat-lto-objects is required for non-mangled static libs
+ CFLAGS+=" -ffat-lto-objects"
+ cd "${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --with-scripts-directory=/usr/lib/brltty \
+ --with-tables-directory=/usr/share/brltty \
+ --with-writable-directory=/run/brltty \
+ --enable-gpm \
+ --disable-stripping
+ make
+}
+
+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 libsystemd.so)
+
+ cd "${pkgname}-${pkgver}"
+ make INSTALL_ROOT="${pkgdir}" install
+ make INSTALL_ROOT="${pkgdir}" install-systemd
+ make INSTALL_ROOT="${pkgdir}" install-udev
+ make INSTALL_ROOT="${pkgdir}" install-dracut
+ make INSTALL_ROOT="${pkgdir}" install-polkit
+ install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
+
+ # fix directory permission and ownership
+ install -vdm 750 -o root -g 102 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: brltty-6.2-systemd_sysusers_groups.patch
===================================================================
--- brltty-6.2-systemd_sysusers_groups.patch 2021-12-28 19:37:44 UTC (rev 433226)
+++ brltty-6.2-systemd_sysusers_groups.patch 2021-12-28 19:37:54 UTC (rev 433227)
@@ -1,46 +0,0 @@
-diff -ruN a/Autostart/Systemd/brltty at .service.in b/Autostart/Systemd/brltty at .service.in
---- a/Autostart/Systemd/brltty at .service.in 2020-12-11 23:51:58.000000000 +0100
-+++ b/Autostart/Systemd/brltty at .service.in 2021-01-20 23:57:46.159394660 +0100
-@@ -83,8 +83,8 @@
-
- # for serial I/O (/dev/ttyS<n>)
- # probably only one of these should be uncommented
--SupplementaryGroups=dialout
--#SupplementaryGroups=uucp
-+# SupplementaryGroups=dialout
-+SupplementaryGroups=uucp
-
- # for USB I/o via USBFS (/dev/bus/usb/*/*)
- SupplementaryGroups=root
-@@ -93,7 +93,7 @@
- SupplementaryGroups=audio
-
- # for playing sound via the Pulse Audio daemon
--SupplementaryGroups=pulse-access
-+# SupplementaryGroups=pulse-access
-
- # for monitoring keyboard input (/dev/input/*)
- SupplementaryGroups=input
-diff -ruN a/Autostart/Systemd/sysusers b/Autostart/Systemd/sysusers
---- a/Autostart/Systemd/sysusers 2020-11-29 13:35:32.000000000 +0100
-+++ b/Autostart/Systemd/sysusers 2021-01-20 23:58:58.186157113 +0100
-@@ -30,8 +30,8 @@
-
- # for serial I/O (/dev/ttyS<n>)
- # probably only one of these should be uncommented
--m brltty dialout
--#m brltty uucp
-+# m brltty dialout
-+m brltty uucp
-
- # for USB I/o (/dev/bus/usb/*/*)
- m brltty root
-@@ -40,7 +40,7 @@
- m brltty audio
-
- # for playing sound via the Pulse Audio daemon
--m brltty pulse-access
-+# m brltty pulse-access
-
- # for monitoring keyboard input (/dev/input/*)
- m brltty input
Copied: brltty/repos/testing-x86_64/brltty-6.2-systemd_sysusers_groups.patch (from rev 433226, brltty/trunk/brltty-6.2-systemd_sysusers_groups.patch)
===================================================================
--- brltty-6.2-systemd_sysusers_groups.patch (rev 0)
+++ brltty-6.2-systemd_sysusers_groups.patch 2021-12-28 19:37:54 UTC (rev 433227)
@@ -0,0 +1,46 @@
+diff -ruN a/Autostart/Systemd/brltty at .service.in b/Autostart/Systemd/brltty at .service.in
+--- a/Autostart/Systemd/brltty at .service.in 2020-12-11 23:51:58.000000000 +0100
++++ b/Autostart/Systemd/brltty at .service.in 2021-01-20 23:57:46.159394660 +0100
+@@ -83,8 +83,8 @@
+
+ # for serial I/O (/dev/ttyS<n>)
+ # probably only one of these should be uncommented
+-SupplementaryGroups=dialout
+-#SupplementaryGroups=uucp
++# SupplementaryGroups=dialout
++SupplementaryGroups=uucp
+
+ # for USB I/o via USBFS (/dev/bus/usb/*/*)
+ SupplementaryGroups=root
+@@ -93,7 +93,7 @@
+ SupplementaryGroups=audio
+
+ # for playing sound via the Pulse Audio daemon
+-SupplementaryGroups=pulse-access
++# SupplementaryGroups=pulse-access
+
+ # for monitoring keyboard input (/dev/input/*)
+ SupplementaryGroups=input
+diff -ruN a/Autostart/Systemd/sysusers b/Autostart/Systemd/sysusers
+--- a/Autostart/Systemd/sysusers 2020-11-29 13:35:32.000000000 +0100
++++ b/Autostart/Systemd/sysusers 2021-01-20 23:58:58.186157113 +0100
+@@ -30,8 +30,8 @@
+
+ # for serial I/O (/dev/ttyS<n>)
+ # probably only one of these should be uncommented
+-m brltty dialout
+-#m brltty uucp
++# m brltty dialout
++m brltty uucp
+
+ # for USB I/o (/dev/bus/usb/*/*)
+ m brltty root
+@@ -40,7 +40,7 @@
+ m brltty audio
+
+ # for playing sound via the Pulse Audio daemon
+-m brltty pulse-access
++# m brltty pulse-access
+
+ # for monitoring keyboard input (/dev/input/*)
+ m brltty input
Copied: brltty/repos/testing-x86_64/brltty-6.4-x11_autostart.patch (from rev 433226, brltty/trunk/brltty-6.4-x11_autostart.patch)
===================================================================
--- brltty-6.4-x11_autostart.patch (rev 0)
+++ brltty-6.4-x11_autostart.patch 2021-12-28 19:37:54 UTC (rev 433227)
@@ -0,0 +1,24 @@
+diff -ruN a/Programs/Makefile.in b/Programs/Makefile.in
+--- a/Programs/Makefile.in 2021-09-24 17:51:55.000000000 +0200
++++ b/Programs/Makefile.in 2021-12-28 18:50:08.104123921 +0100
+@@ -1120,7 +1120,7 @@
+ install-xbrlapi: xbrlapi$X install-program-directory install-x11-autostart-directory install-gdm-autostart-directory
+ $(INSTALL_PROGRAM) xbrlapi$X $(INSTALL_PROGRAM_DIRECTORY)
+ $(INSTALL_DATA) $(BLD_TOP)$(DOC_DIR)/xbrlapi.1 $(INSTALL_MAN1_DIRECTORY)
+- $(INSTALL_DATA) $(BLD_TOP)Autostart/X11/$(XBRLAPI_X11_AUTOSTART_FILE) $(INSTALL_X11_AUTOSTART_DIRECTORY)
++ $(INSTALL_PROGRAM) $(BLD_TOP)Autostart/X11/$(XBRLAPI_X11_AUTOSTART_FILE) $(INSTALL_X11_AUTOSTART_DIRECTORY)
+ $(INSTALL_DATA) $(SRC_TOP)Autostart/gdm/$(XBRLAPI_GDM_AUTOSTART_FILE) $(INSTALL_GDM_AUTOSTART_DIRECTORY)
+
+ install-tables: $(INSTALL_TEXT_TABLES) $(INSTALL_CONTRACTION_TABLES) $(INSTALL_ATTRIBUTES_TABLES) install-keyboard-tables install-input-tables
+diff -ruN a/common.mk b/common.mk
+--- a/common.mk 2021-09-02 11:07:57.000000000 +0200
++++ b/common.mk 2021-12-28 18:46:33.618469544 +0100
+@@ -121,7 +121,7 @@
+ install-apisoc-directory:
+ -$(INSTALL_DIRECTORY) -m 1777 $(INSTALL_APISOC_DIRECTORY)
+
+-INSTALL_X11_AUTOSTART_DIRECTORY = $(INSTALL_ROOT)$(sysconfdir)/X11/Xsession.d
++INSTALL_X11_AUTOSTART_DIRECTORY = $(INSTALL_ROOT)$(sysconfdir)/X11/xinit/xinitrc.d
+ install-x11-autostart-directory:
+ -$(INSTALL_DIRECTORY) $(INSTALL_X11_AUTOSTART_DIRECTORY)
+
Deleted: brltty.install
===================================================================
--- brltty.install 2021-12-28 19:37:44 UTC (rev 433226)
+++ brltty.install 2021-12-28 19:37:54 UTC (rev 433227)
@@ -1,12 +0,0 @@
-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
-}
Copied: brltty/repos/testing-x86_64/brltty.install (from rev 433226, brltty/trunk/brltty.install)
===================================================================
--- brltty.install (rev 0)
+++ brltty.install 2021-12-28 19:37:54 UTC (rev 433227)
@@ -0,0 +1,12 @@
+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
+}
More information about the arch-commits
mailing list