diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-25 19:00:02 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-12-26 08:59:50 +0100 |
commit | be35adbd1160550e441ead585a97faba68a83f27 (patch) | |
tree | a5d719110cc081d7af9c610f8251aa6118fdd64d /source | |
parent | 4f356a745d1cfec7850c8c2c4a779184f8b418dc (diff) | |
download | current-be35adbd1160550e441ead585a97faba68a83f27.tar.gz |
Wed Dec 25 19:00:02 UTC 201920191225190002
d/ruby-2.7.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
d/subversion-1.13.0-x86_64-2.txz: Rebuilt.
Recompiled against ruby-2.7.0.
kde/korundum-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against ruby-2.7.0.
kde/qtruby-4.14.3-x86_64-11.txz: Rebuilt.
Recompiled against ruby-2.7.0.
n/epic5-2.1.1-x86_64-3.txz: Rebuilt.
Ruby support won't build, so we'll skip it for now.
x/libva-2.6.0-x86_64-1.txz: Upgraded.
x/libva-utils-2.6.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-x | source/d/ruby/ruby.SlackBuild | 4 | ||||
-rwxr-xr-x | source/d/subversion/subversion.SlackBuild | 2 | ||||
-rw-r--r-- | source/kde/build/korundum | 2 | ||||
-rw-r--r-- | source/kde/build/qtruby | 2 | ||||
-rwxr-xr-x | source/n/epic5/epic5.SlackBuild | 9 | ||||
-rwxr-xr-x | source/x/libva-utils/libva-utils.SlackBuild | 38 | ||||
-rwxr-xr-x | source/x/libva/libva.SlackBuild | 38 |
7 files changed, 48 insertions, 47 deletions
diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild index 4a4cf462..d3c486f5 100755 --- a/source/d/ruby/ruby.SlackBuild +++ b/source/d/ruby/ruby.SlackBuild @@ -32,7 +32,7 @@ else VERSION=$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) fi -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -111,7 +111,7 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/ruby-$VERSION cp -a \ - BSDL COPYING* *GPL* ChangeLog LEGAL NEWS README* ToDo \ + BSDL* CONTRIBUTING* COPYING* ChangeLog *GPL* LEGAL* NEWS* README* \ $PKG/usr/doc/ruby-$VERSION # The entire ChangeLog is excessive for most users: diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 5d0bb653..1097bb7e 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=subversion VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/kde/build/korundum b/source/kde/build/korundum index 7f8f011e..45a4fb75 100644 --- a/source/kde/build/korundum +++ b/source/kde/build/korundum @@ -1 +1 @@ -7 +8 diff --git a/source/kde/build/qtruby b/source/kde/build/qtruby index f599e28b..b4de3947 100644 --- a/source/kde/build/qtruby +++ b/source/kde/build/qtruby @@ -1 +1 @@ -10 +11 diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index 0100fd9d..f1cb70a2 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,11 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} + +# Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible. +# Patches to fix this are welcome, otherwise we'll keep an eye on upstream. +RUBY_OPTION=${RUBY_OPTION:---without-ruby} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -82,6 +86,7 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --with-tcl=/usr/lib${LIBDIRSUFFIX}/tclConfig.sh \ + $RUBY_OPTION \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild index 9eaaae53..d07c0bea 100755 --- a/source/x/libva-utils/libva-utils.SlackBuild +++ b/source/x/libva-utils/libva-utils.SlackBuild @@ -75,29 +75,27 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# These fix a mandatory check for wayland-scanner: -mkdir -p m4 -autoreconf -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-shared \ - --disable-static \ - --enable-dummy-driver \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild index 876c20f0..1f27702f 100755 --- a/source/x/libva/libva.SlackBuild +++ b/source/x/libva/libva.SlackBuild @@ -75,29 +75,27 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# These fix a mandatory check for wayland-scanner: -mkdir -p m4 -autoreconf -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-shared \ - --disable-static \ - --enable-dummy-driver \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true |