upgpkg: brltty 6.4-8: Rebuild to run strip-nondeterminism on brlapi.jar

trunk/PKGBUILD

@@ -10,7 +10,7 @@
 
 pkgname=brltty
 pkgver=6.4
-pkgrel=5
+pkgrel=9
 pkgdesc="Braille display driver for Linux/Unix"
 url='https://brltty.app'
 
@@ -18,6 +18,7 @@ track="archive"
 target="$pkgname-$pkgver"
 source=(
     "https://brltty.app/${track}/${target}.tar.bz2"
+    brltty-6.4-x11_autostart.patch
     brltty.sysusers
     brltty.tmpfiles
 )
@@ -35,7 +36,6 @@ makedepends=(
     'espeak-ng'
     'expat'
     'festival'
-    'flite'
     'glib2'
     'gpm'
     'icu'
@@ -45,6 +45,8 @@ makedepends=(
     'ocaml-ctypes'
     'ocaml-findlib'
     'speech-dispatcher'
+    'strip-nondeterminism'
+    'tcl'
 )   ## 'dracut'
 
 #------------------------
@@ -58,7 +60,6 @@ depends=(
     'libspeechd'
     'pcre2'
     'polkit'
-    'tcl'
 )
 
 optdepends=(
@@ -74,10 +75,12 @@ optdepends=(
     'ocaml: OCaml support'
     'python: Python support'
     'speech-dispatcher: speech-dispatcher driver'
+    'tcl: tcl support'
 )   # 'dracut: initramfs support'
 
 backup=(
     'etc/brltty.conf'
+    'etc/X11/xinit/xinitrc.d/90xbrlapi'
 )
 
 provides=(
@@ -95,6 +98,7 @@ install=brltty.install
 
 prepare() {
     cd $pkgname-$pkgver
+    patch -Np1 -i ../brltty-6.4-x11_autostart.patch
     ./autogen
 }
 
@@ -122,6 +126,9 @@ build() {
 
     ./configure "${_flags[@]}"
     make
+
+    ## make brlapi.jar deterministic
+    find . -type f -iname "*.jar" -exec strip-nondeterminism {} \;
 }
 
 #----------

trunk/brltty-6.4-x11_autostart.patch

+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)
+