diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /extra/source/brltty | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'extra/source/brltty')
-rwxr-xr-x | extra/source/brltty/brltty.SlackBuild | 25 | ||||
-rw-r--r-- | extra/source/brltty/brltty.fix.blanks.diff | 27 | ||||
-rwxr-xr-x | extra/source/brltty/dump.dos.windows.stuff.sh | 14 | ||||
-rw-r--r-- | extra/source/brltty/slack-desc | 2 |
4 files changed, 59 insertions, 9 deletions
diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild index 4678d34a..b53c14ac 100755 --- a/extra/source/brltty/brltty.SlackBuild +++ b/extra/source/brltty/brltty.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,13 +30,14 @@ if [ ! -d $TMP ]; then fi PKG=/tmp/package-brltty -VERSION=4.5 -BUILD=${BUILD:-1} +PKGNAM=brltty +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -49,6 +50,8 @@ else LIBDIRSUFFIX="" fi +NUMJOBS=${NUMJOBS:-" -j7 "} + rm -rf $PKG mkdir -p $PKG cd $TMP @@ -57,6 +60,7 @@ tar xvf $CWD/brltty-$VERSION.tar.?z* || exit 1 cd brltty-$VERSION zcat $CWD/brltty.brlapi.pyx.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/brltty.fix.blanks.diff.gz | patch -p1 --verbose || exit 1 sh autogen @@ -66,6 +70,7 @@ find . -perm 700 -exec chmod 755 {} \; find . -perm 744 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; find . -perm 600 -exec chmod 644 {} \; + ./configure \ --prefix=/usr \ --bindir=/bin \ @@ -76,11 +81,16 @@ find . -perm 600 -exec chmod 644 {} \; --sysconfdir=/etc \ --localstatedir=/var \ --disable-java-bindings \ - --build=$ARCH-slackware-linux -make -j2 || exit 1 + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || exit 1 make install INSTALL_ROOT=$PKG || exit 1 chmod 755 $PKG/bin/* $PKG/lib${LIBDIRSUFFIX}/brltty/* +# Add udev rules: +mkdir -p $PKG/lib/udev/rules.d +cp Autostart/Udev/udev.rules $PKG/lib/udev/rules.d/40-usb-brltty.rules + ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -89,9 +99,8 @@ chmod 755 $PKG/bin/* $PKG/lib${LIBDIRSUFFIX}/brltty/* mkdir -p $PKG/usr/doc/brltty-$VERSION cp -a \ README* COPYING* \ - Documents/{Manual-*,TODO,CONTRIBUTORS,HISTORY,README.*} \ + Documents/{ChangeLog,Manual-*,TODO,CONTRIBUTORS,HISTORY,README.*} \ $PKG/usr/doc/brltty-$VERSION -cat Documents/ChangeLog | head -n 150 > $PKG/usr/doc/brltty-$VERSION/ChangeLog ( cd $PKG/usr/doc/brltty-$VERSION find . -name "Makefile*" -exec rm -f {} \; find . -name "*.sgml" -exec rm -f {} \; diff --git a/extra/source/brltty/brltty.fix.blanks.diff b/extra/source/brltty/brltty.fix.blanks.diff new file mode 100644 index 00000000..19e4cefe --- /dev/null +++ b/extra/source/brltty/brltty.fix.blanks.diff @@ -0,0 +1,27 @@ +From 74171852c8c11ebd4725e93cfac6a19906821272 Mon Sep 17 00:00:00 2001 +From: Dave Mielke <dave@mielke.cc> +Date: Mon, 8 Feb 2016 22:06:45 -0500 +Subject: [PATCH] The Linux screen driver should prefer a blank [U+0020] if the + same glyph is also used for other characters. (dm) + +--- + Drivers/Screen/Linux/screen.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Drivers/Screen/Linux/screen.c b/Drivers/Screen/Linux/screen.c +index bb5e273..bc2f2c4 100644 +--- a/Drivers/Screen/Linux/screen.c ++++ b/Drivers/Screen/Linux/screen.c +@@ -912,7 +912,9 @@ setTranslationTable (int force) { + const struct unipair *sfm = &screenFontMapTable[--screenFontMapIndex]; + + if (sfm->fontpos < count) { +- translationTable[sfm->fontpos] = sfm->unicode; ++ wchar_t *character = &translationTable[sfm->fontpos]; ++ if (*character == 0X20) continue; ++ *character = sfm->unicode; + } + } + } +-- +2.1.1.1.g1fb337f diff --git a/extra/source/brltty/dump.dos.windows.stuff.sh b/extra/source/brltty/dump.dos.windows.stuff.sh new file mode 100755 index 00000000..0d94beec --- /dev/null +++ b/extra/source/brltty/dump.dos.windows.stuff.sh @@ -0,0 +1,14 @@ +#!/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 diff --git a/extra/source/brltty/slack-desc b/extra/source/brltty/slack-desc index d9962499..d1cb59db 100644 --- a/extra/source/brltty/slack-desc +++ b/extra/source/brltty/slack-desc @@ -12,7 +12,7 @@ brltty: BRLTTY is a daemon which provides access to the Linux console (text brltty: mode) for a blind person using a soft braille display. It drives the brltty: braille terminal and provides complete screen review functionality. brltty: -brltty: +brltty: Homepage: http://mielke.cc/brltty/ brltty: brltty: brltty: |