From 37498e325fe958c6948fae9ee70e16ec9427d9a4 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 29 Feb 2020 10:21:37 +0100 Subject: 20200229.1 global branch merge. Signed-off-by: Matteo Bernardini --- accessibility/easystroke/easystroke.SlackBuild | 1 + accessibility/easystroke/gcc7-build-fix.patch | 40 ++++++++++++++++++++++++++ accessibility/flite/flite.info | 2 +- accessibility/jpilot/jpilot.SlackBuild | 23 +++++++-------- accessibility/jpilot/jpilot.info | 6 ++-- accessibility/xsel/xsel.SlackBuild | 2 +- 6 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 accessibility/easystroke/gcc7-build-fix.patch (limited to 'accessibility') diff --git a/accessibility/easystroke/easystroke.SlackBuild b/accessibility/easystroke/easystroke.SlackBuild index 29b04e812b..3e2f2fedcc 100644 --- a/accessibility/easystroke/easystroke.SlackBuild +++ b/accessibility/easystroke/easystroke.SlackBuild @@ -59,6 +59,7 @@ sed -i 's|-lboost_serialization-mt|-lboost_serialization|' Makefile # Thanks to ARCH Linux patch -p1 < $CWD/lambda.patch +patch -p1 < $CWD/gcc7-build-fix.patch make CXX="g++ $SLKCFLAGS" CC="gcc -std=c99 $SLKCFLAGS" PREFIX=/usr diff --git a/accessibility/easystroke/gcc7-build-fix.patch b/accessibility/easystroke/gcc7-build-fix.patch new file mode 100644 index 0000000000..b66bcb4edf --- /dev/null +++ b/accessibility/easystroke/gcc7-build-fix.patch @@ -0,0 +1,40 @@ +From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Sat, 28 Jan 2017 01:26:00 +0000 +Subject: [PATCH] Remove abs(float) function that clashes with std::abs(float) + +Depending on which C++ standard library headers have been included there +might an abs(float) function already declared in the global namespace, +so the definition in this file conflicts with it. This cause a build +failure with GCC 7, which conforms more closely to the C++ standard with +respect to overloads of abs. + +Including and adding a using-declaration for std::abs ensures +that the standard std::abs(float) function is available. This solution +should be portable to all compilers. +--- + handler.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/handler.cc b/handler.cc +index 8830ea2..685b1ff 100644 +--- a/handler.cc ++++ b/handler.cc +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include // std::abs(float) ++using std::abs; + + XState *xstate = nullptr; + +@@ -533,8 +535,6 @@ class WaitForPongHandler : public Handler, protected Timeout { + virtual Grabber::State grab_mode() { return parent->grab_mode(); } + }; + +-static inline float abs(float x) { return x > 0 ? x : -x; } +- + class AbstractScrollHandler : public Handler { + bool have_x, have_y; + float last_x, last_y; diff --git a/accessibility/flite/flite.info b/accessibility/flite/flite.info index 4b6c62b261..05d4e52227 100644 --- a/accessibility/flite/flite.info +++ b/accessibility/flite/flite.info @@ -5,6 +5,6 @@ DOWNLOAD="http://festvox.org/flite/packed/flite-2.1/flite-2.1-release.tar.bz2" MD5SUM="915ac91068fc962f4a0e8aa26164cc8a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="texi2html" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/accessibility/jpilot/jpilot.SlackBuild b/accessibility/jpilot/jpilot.SlackBuild index 78eeb3f868..e2dd848145 100644 --- a/accessibility/jpilot/jpilot.SlackBuild +++ b/accessibility/jpilot/jpilot.SlackBuild @@ -25,13 +25,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jpilot -VERSION=${VERSION:-1.8.1} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,15 +60,16 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP rm -rf $PRGNAM-$VERSION +cd $TMP +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS -std=gnu89" \ CXXFLAGS="$SLKCFLAGS -std=gnu89" \ @@ -84,10 +85,8 @@ CXXFLAGS="$SLKCFLAGS -std=gnu89" \ make make install-strip DESTDIR=$PKG -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mv $PKG/usr/share/doc $PKG/usr mv $PKG/usr/doc/jpilot $PKG/usr/doc/jpilot-$VERSION diff --git a/accessibility/jpilot/jpilot.info b/accessibility/jpilot/jpilot.info index 4030813d5e..9d14b884f0 100644 --- a/accessibility/jpilot/jpilot.info +++ b/accessibility/jpilot/jpilot.info @@ -1,8 +1,8 @@ PRGNAM="jpilot" -VERSION="1.8.1" +VERSION="1.8.2" HOMEPAGE="http://www.jpilot.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/jpilot-1.8.1.tar.gz" -MD5SUM="ac59a5708f37e30d39e85b1fcedd266f" +DOWNLOAD="http://jpilot.org/tarballs/jpilot-1.8.2.tar.gz" +MD5SUM="8b539d8943ac75c7890fc5c071e89adb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/accessibility/xsel/xsel.SlackBuild b/accessibility/xsel/xsel.SlackBuild index 67a373675a..2ff4a0386f 100644 --- a/accessibility/xsel/xsel.SlackBuild +++ b/accessibility/xsel/xsel.SlackBuild @@ -54,7 +54,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ -- cgit v1.2.3