upgpkg: brltty-git 6.3.r412.gf23bc3295-1

improve PKGBUILD.

4 files changed, 58 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 001d77b904f1..cfb290293adb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = brltty-git
 	pkgdesc = Braille display driver for Linux/Unix (development version)
-	pkgver = 6.3.r130.g58497b388
+	pkgver = 6.3.r412.gf23bc3295
 	pkgrel = 1
 	url = https://brltty.app
 	install = brltty-git.install
@@ -54,9 +54,9 @@ pkgbase = brltty-git
 	options = !emptydirs
 	backup = etc/brltty.conf
 	source = brltty::git+https://github.com/brltty/brltty.git
-	source = brltty-systemd.patch
+	source = brltty-6.2-systemd_sysusers_groups.patch
 	sha512sums = SKIP
-	sha512sums = eab819248b5bbf8251e1bedc5009aec1ebd8fa8b8a09e2eef116d582f31d7d13d9837e06bd09a3910159cc97406d73e98bb0e9e99102fcb35e667a12153e4aa2
+	sha512sums = 32ba91271e2247b4a330cd213ed75b591268cb99a79c2efd9ae675804faee027c6b2f782768cb2329a65fc914ca2400b2901f35ce1fc2522c6691b343799eb02
 
 pkgname = brltty-git
 	depends = bluez-libs
@@ -77,4 +77,3 @@ pkgname = brltty-git
 	depends = libgpm.so
 	depends = libncursesw.so
 	depends = libsystemd.so
-
diff --git a/PKGBUILD b/PKGBUILD
index 13dc7c1c4899..55078db1d82a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexander Epaneshnikov <aarnaarn2@gmail.com>
 
 pkgname=brltty-git
-pkgver=6.3.r130.g58497b388
+pkgver=6.3.r412.gf23bc3295
 pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix (development version)"
 arch=('x86_64')
@@ -26,30 +26,30 @@ optdepends=('at-spi2-core: X11/GNOME Apps accessibility'
             'ocaml: OCaml support'
             'python: Python support'
             'speech-dispatcher: speech-dispatcher driver')
-conflicts=('brltty')
 provides=('brltty' 'libbrlapi.so')
+conflicts=('brltty')
 backup=(etc/brltty.conf)
 options=('!emptydirs')
 install=${pkgname}.install
 source=(${pkgname%-git}::'git+https://github.com/brltty/brltty.git'
-          ${pkgname%-git}-systemd.patch)
+        "${pkgname%-git}-6.2-systemd_sysusers_groups.patch")
 sha512sums=('SKIP'
-            'eab819248b5bbf8251e1bedc5009aec1ebd8fa8b8a09e2eef116d582f31d7d13d9837e06bd09a3910159cc97406d73e98bb0e9e99102fcb35e667a12153e4aa2')
+            '32ba91271e2247b4a330cd213ed75b591268cb99a79c2efd9ae675804faee027c6b2f782768cb2329a65fc914ca2400b2901f35ce1fc2522c6691b343799eb02')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-git}"
+	cd "${pkgname%-git}"
 	# cutting off 'BRLTTY.' prefix that presents in the git tag
 	git describe --long | sed 's/^BRLTTY.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "${srcdir}/${pkgname%-git}"
-	patch -p1 -i "$srcdir/${pkgname%-git}-systemd.patch"
+	cd "${pkgname%-git}"
+	patch -Np1 -i ../"${pkgname%-git}-6.2-systemd_sysusers_groups.patch"
 	./autogen
 }
 
 build() {
-	cd "${srcdir}/${pkgname%-git}"
+	cd "${pkgname%-git}"
 	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	          --mandir=/usr/share/man \
 	          --with-tables-directory=/usr/share/brltty \
@@ -64,7 +64,7 @@ package() {
 	depends+=('libasound.so' 'libdbus-1.so' 'libgio-2.0.so' 'libglib-2.0.so'
 	          'libgobject-2.0.so' 'libicuuc.so' 'libgpm.so' 'libncursesw.so'
 	          'libsystemd.so')
-	cd "${srcdir}/${pkgname%-git}"
+	cd "${pkgname%-git}"
 	make INSTALL_ROOT="${pkgdir}" install
 	make INSTALL_ROOT="${pkgdir}" install-systemd
 	make INSTALL_ROOT="${pkgdir}" install-udev
diff --git a/brltty-6.2-systemd_sysusers_groups.patch b/brltty-6.2-systemd_sysusers_groups.patch
new file mode 100644
index 000000000000..13430fbab16b
--- /dev/null
+++ b/brltty-6.2-systemd_sysusers_groups.patch
@@ -0,0 +1,46 @@
+diff -ruN a/Autostart/Systemd/brltty@.service.in b/Autostart/Systemd/brltty@.service.in
+--- a/Autostart/Systemd/brltty@.service.in	2020-12-11 23:51:58.000000000 +0100
++++ b/Autostart/Systemd/brltty@.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
diff --git a/brltty-systemd.patch b/brltty-systemd.patch
deleted file mode 100644
index ea32e28be8dd..000000000000
--- a/brltty-systemd.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/Autostart/Systemd/brltty@.service.in b/Autostart/Systemd/brltty@.service.in
-index e3c1164b3..bb97278e4 100644
---- a/Autostart/Systemd/brltty@.service.in
-+++ b/Autostart/Systemd/brltty@.service.in
-@@ -85,8 +85,8 @@ SupplementaryGroups=tty
- 
- # 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
-@@ -95,7 +95,7 @@ SupplementaryGroups=root
- SupplementaryGroups=audio
- 
- # for playing sound via the Pulse Audio daemon
--SupplementaryGroups=pulse-access
-+#SupplementaryGroups=pulse-access
- 
- # for monitoring keyboard input (/dev/input/*)
- SupplementaryGroups=input
-@@ -105,4 +105,3 @@ SupplementaryGroups=root
- 
- # for reading the BrlAPI authorization key file
- SupplementaryGroups=brlapi
--
-diff --git a/Autostart/Systemd/sysusers b/Autostart/Systemd/sysusers
-index 1819984cd..0acf7cc5a 100644
---- a/Autostart/Systemd/sysusers
-+++ b/Autostart/Systemd/sysusers
-@@ -30,8 +30,8 @@ m brltty tty
- 
- # 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 root
- 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
-@@ -50,4 +50,3 @@ m brltty root
- 
- # for reading the BrlAPI authorization key file
- m brltty brlapi
--