From 3f4048014366ba929686d067807a2ec0368a9238 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 6 Apr 2020 21:23:19 +0000
Subject: Mon Apr  6 21:23:19 UTC 2020

ap/vim-8.2.0521-x86_64-1.txz:  Upgraded.
d/vala-0.48.3-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.10_5-x86_64-1.txz:  Upgraded.
x/compiz-0.8.18-x86_64-1.txz:  Upgraded.
xap/audacious-4.0.1-x86_64-1.txz:  Upgraded.
xap/audacious-plugins-4.0.1-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.0521-x86_64-1.txz:  Upgraded.
extra/brltty/brltty-6.1-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/audacious-plugins-4.0.1-x86_64-1_alsa.txz:  Upgraded.
testing/packages/PAM/sudo-1.8.31p1-x86_64-1_pam.txz:  Upgraded.
---
 extra/source/brltty/brltty.SlackBuild                |  4 +---
 extra/source/brltty/brltty.brlapi.pyx.diff           | 11 -----------
 .../source/brltty/dump.dos.windows.android.stuff.sh  | 20 ++++++++++++++++++++
 extra/source/brltty/dump.dos.windows.stuff.sh        | 14 --------------
 4 files changed, 21 insertions(+), 28 deletions(-)
 delete mode 100644 extra/source/brltty/brltty.brlapi.pyx.diff
 create mode 100755 extra/source/brltty/dump.dos.windows.android.stuff.sh
 delete mode 100755 extra/source/brltty/dump.dos.windows.stuff.sh

(limited to 'extra')

diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild
index 7b6519c3c..86c3e472f 100755
--- a/extra/source/brltty/brltty.SlackBuild
+++ b/extra/source/brltty/brltty.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2010, 2012, 2013, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2012, 2013, 2016, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -67,8 +67,6 @@ rm -rf brltty-$VERSION
 tar xvf $CWD/brltty-$VERSION.tar.?z || exit 1
 cd brltty-$VERSION || exit 1
 
-zcat $CWD/brltty.brlapi.pyx.diff.gz | patch -p1 --verbose || exit 1
-
 sh autogen
 
 chown -R root:root .
diff --git a/extra/source/brltty/brltty.brlapi.pyx.diff b/extra/source/brltty/brltty.brlapi.pyx.diff
deleted file mode 100644
index be58ca6ca..000000000
--- a/extra/source/brltty/brltty.brlapi.pyx.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Bindings/Python/brlapi.pyx.orig	2013-04-01 15:37:26.000000000 -0500
-+++ ./Bindings/Python/brlapi.pyx	2013-09-09 18:01:39.196869555 -0500
-@@ -497,7 +497,7 @@
- 		if (type(dots) == unicode):
- 			dots = dots.encode('latin1')
- 		if (len(dots) < dispSize):
--			dots = dots + b"".center(dispSize - len(dots), '\0')
-+			dots = dots + "".center(dispSize - len(dots), '\0')
- 		c_dots = dots
- 		c_udots = <unsigned char *>c_dots
- 		c_brlapi.Py_BEGIN_ALLOW_THREADS
diff --git a/extra/source/brltty/dump.dos.windows.android.stuff.sh b/extra/source/brltty/dump.dos.windows.android.stuff.sh
new file mode 100755
index 000000000..9b64f6783
--- /dev/null
+++ b/extra/source/brltty/dump.dos.windows.android.stuff.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Repacks the brltty tarball to remove the unneeded DOS/Windows stuff.
+
+VERSION=${VERSION:-$(echo brltty-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+
+tar xf brltty-${VERSION}.tar.xz || exit 1
+mv brltty-${VERSION}.tar.xz brltty-${VERSION}.tar.xz.orig
+rm brltty-${VERSION}/Android/Application/assets/UBraille.ttf
+rm brltty-${VERSION}/Android/Application/libs/support-v4-19.1.0.jar
+rm -r brltty-${VERSION}/Android/Application/src/*
+rm -r brltty-${VERSION}/Android/Application/res/*
+rm -r brltty-${VERSION}/Android/Core/res/*
+rm -r brltty-${VERSION}/Android/Core/src/*
+rm -r brltty-${VERSION}/DOS
+rm -r brltty-${VERSION}/Windows
+tar cf brltty-${VERSION}.tar brltty-${VERSION}
+rm -r brltty-${VERSION}
+plzip -9 brltty-${VERSION}.tar
+touch -r brltty-${VERSION}.tar.xz.orig brltty-${VERSION}.tar.lz
+rm brltty-${VERSION}.tar.xz.orig
diff --git a/extra/source/brltty/dump.dos.windows.stuff.sh b/extra/source/brltty/dump.dos.windows.stuff.sh
deleted file mode 100755
index 0d94beec4..000000000
--- a/extra/source/brltty/dump.dos.windows.stuff.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Repacks the brltty tarball to remove the unneeded DOS/Windows stuff.
-
-VERSION=${VERSION:-$(echo brltty-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-
-tar xf brltty-${VERSION}.tar.xz || exit 1
-mv brltty-${VERSION}.tar.xz brltty-${VERSION}.tar.xz.orig
-rm -r brltty-${VERSION}/DOS
-rm -r brltty-${VERSION}/Windows
-tar cf brltty-${VERSION}.tar brltty-${VERSION}
-rm -r brltty-${VERSION}
-xz -9 brltty-${VERSION}.tar
-touch -r brltty-${VERSION}.tar.xz.orig brltty-${VERSION}.tar.xz
-rm brltty-${VERSION}.tar.xz.orig
-- 
cgit v1.2.3