diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/pamixer/pamixer.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/rpm/rpm.SlackBuild | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kig | 2 | ||||
-rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/krita.patch | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/krita/krita.boost_1_75_0.diff | 13 | ||||
-rwxr-xr-x | source/l/atkmm/atkmm.SlackBuild | 36 | ||||
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 4 | ||||
-rwxr-xr-x | source/l/cryfs/cryfs.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/glade3/glade3.SlackBuild | 119 | ||||
-rw-r--r-- | source/l/glade3/slack-desc | 19 | ||||
-rwxr-xr-x | source/l/gtkmm3/gtkmm3.SlackBuild | 36 | ||||
-rwxr-xr-x | source/l/openexr/openexr.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/pangomm/pangomm.SlackBuild | 33 | ||||
-rwxr-xr-x | source/l/rttr/rttr.SlackBuild | 5 | ||||
-rw-r--r-- | source/n/s-nail/s-nail.url | 4 | ||||
-rwxr-xr-x | source/x/marisa/marisa.SlackBuild | 12 | ||||
-rwxr-xr-x | source/xap/xpaint/xpaint.SlackBuild | 6 | ||||
-rwxr-xr-x | source/xfce/libxfce4ui/libxfce4ui.SlackBuild | 2 |
19 files changed, 98 insertions, 205 deletions
diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild index 77f6717b..7cae411e 100755 --- a/source/ap/pamixer/pamixer.SlackBuild +++ b/source/ap/pamixer/pamixer.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pamixer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild index 7c5c85b3..e50b9883 100755 --- a/source/ap/rpm/rpm.SlackBuild +++ b/source/ap/rpm/rpm.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rpm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/kig +++ b/source/kde/kde/build/kig @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/krita.patch b/source/kde/kde/patch/krita.patch new file mode 100644 index 00000000..45232094 --- /dev/null +++ b/source/kde/kde/patch/krita.patch @@ -0,0 +1,2 @@ +# Boost 1.75.0 requires C++ 14 standard: +cat $CWD/patch/krita/krita.boost_1_75_0.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/krita/krita.boost_1_75_0.diff b/source/kde/kde/patch/krita/krita.boost_1_75_0.diff new file mode 100644 index 00000000..c177274f --- /dev/null +++ b/source/kde/kde/patch/krita/krita.boost_1_75_0.diff @@ -0,0 +1,13 @@ +--- ./CMakeLists.txt.orig 2020-10-28 06:42:28.000000000 -0500 ++++ ./CMakeLists.txt 2020-12-14 14:12:57.970780187 -0600 +@@ -568,6 +568,10 @@ + add_definitions(-DBOOST_ALL_NO_LIB) + find_package(Boost 1.55 REQUIRED COMPONENTS system) + include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++if(${Boost_VERSION} VERSION_GREATER_EQUAL "1.75") ++ message(WARNING "Boost 1.75 or higher detected, upgrading to C++14.") ++ set(CMAKE_CXX_STANDARD 14) ++endif() + ## + ## Test for GNU Scientific Library + ## diff --git a/source/l/atkmm/atkmm.SlackBuild b/source/l/atkmm/atkmm.SlackBuild index 4d5a2a33..fb955461 100755 --- a/source/l/atkmm/atkmm.SlackBuild +++ b/source/l/atkmm/atkmm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2015, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -74,31 +74,35 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -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 \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS libdocdir=/usr/doc/$PKGNAM-$VERSION || make libdocdir=/usr/doc/$PKGNAM-$VERSION || exit 1 -make install libdocdir=/usr/doc/$PKGNAM-$VERSION 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 | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* NEWS README* \ $PKG/usr/doc/$PKGNAM-$VERSION -# Remove images, API docs, and useless html file -rm -rf $PKG/usr/doc/$PKGNAM-$VERSION/{images,reference,index.html} # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index ebe48488..41e0ccbb 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2007, 2008, 2012 Eric Hameleers, Eindhoven, NL # Copyright 2007-2008, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, NL -# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/cryfs/cryfs.SlackBuild b/source/l/cryfs/cryfs.SlackBuild index 11f021f0..007bd1f7 100755 --- a/source/l/cryfs/cryfs.SlackBuild +++ b/source/l/cryfs/cryfs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cryfs VERSION=${VERSION:-$(echo $PKGNAM-*.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/l/glade3/glade3.SlackBuild b/source/l/glade3/glade3.SlackBuild deleted file mode 100755 index d8ddbf8b..00000000 --- a/source/l/glade3/glade3.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for glade3 - -# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=glade3 -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL NEWS README* TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/glade3/slack-desc b/source/l/glade3/slack-desc deleted file mode 100644 index 3805b1c0..00000000 --- a/source/l/glade3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -glade3: glade3 (Glade UI Designer version 3) -glade3: -glade3: Glade is a RAD tool to enable quick and easy development of user -glade3: interfaces for the GTK+ toolkit and the GNOME desktop environment. -glade3: The user interfaces designed in Glade are saved as XML, and by using -glade3: the GtkBuilder GTK+ object these can be loaded by applications -glade3: dynamically as needed. -glade3: -glade3: Homepage: http://glade.gnome.org/ -glade3: -glade3: diff --git a/source/l/gtkmm3/gtkmm3.SlackBuild b/source/l/gtkmm3/gtkmm3.SlackBuild index d6d67b30..cb5d066a 100755 --- a/source/l/gtkmm3/gtkmm3.SlackBuild +++ b/source/l/gtkmm3/gtkmm3.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2015, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -77,31 +77,35 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -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 \ - --docdir=/usr/doc/$SRCNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS libdocdir=/usr/doc/$SRCNAM-$VERSION || make libdocdir=/usr/doc/$SRCNAM-$VERSION || exit 1 -make install libdocdir=/usr/doc/$SRCNAM-$VERSION 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 | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION cp -a \ AUTHORS COPYING* NEWS PORTING README* \ $PKG/usr/doc/$SRCNAM-$VERSION -# Remove images, API docs, and useless html file -rm -rf $PKG/usr/doc/$SRCNAM-$VERSION/{images,reference,index.html} # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild index 6305eae9..286b4fc0 100755 --- a/source/l/openexr/openexr.SlackBuild +++ b/source/l/openexr/openexr.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openexr VERSION=${VERSION:-$(echo $PKGNAM-*.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/l/pangomm/pangomm.SlackBuild b/source/l/pangomm/pangomm.SlackBuild index a60d4871..3e8ccc99 100755 --- a/source/l/pangomm/pangomm.SlackBuild +++ b/source/l/pangomm/pangomm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2015, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -74,22 +74,27 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -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 \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || 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 | xargs 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/l/rttr/rttr.SlackBuild b/source/l/rttr/rttr.SlackBuild index d5b8531e..573fa2fd 100755 --- a/source/l/rttr/rttr.SlackBuild +++ b/source/l/rttr/rttr.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rttr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d -)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -112,6 +112,9 @@ cd cmake-build make install DESTDIR=$PKG || exit 1 cd .. +# This package makes a mess of things in /usr/doc: +rm -rf $PKG/usr/doc + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/n/s-nail/s-nail.url b/source/n/s-nail/s-nail.url index 149bf269..7916506a 100644 --- a/source/n/s-nail/s-nail.url +++ b/source/n/s-nail/s-nail.url @@ -1,2 +1,2 @@ -http://ftp.sdaoden.eu/s-nail-14.9.19.tar.xz -http://ftp.sdaoden.eu/s-nail-14.9.19.tar.xz.asc +http://ftp.sdaoden.eu/s-nail-14.9.20.tar.xz +http://ftp.sdaoden.eu/s-nail-14.9.20.tar.xz.asc diff --git a/source/x/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild index f21f027d..682e0f83 100755 --- a/source/x/marisa/marisa.SlackBuild +++ b/source/x/marisa/marisa.SlackBuild @@ -107,8 +107,8 @@ make install DESTDIR=$PKG || exit 1 cd bindings/perl perl Makefile.PL \ - INC="-I$TMP/marisa-$VERSION/lib" \ - LIBS="-L$TMP/marisa-$VERSION/lib/.libs" \ + INC="-I$PKG/usr/include" \ + LIBS="-L$PKG/usr/lib${LIBDIRSUFFIX}" \ PREFIX=/usr \ INSTALLDIRS=vendor @@ -119,16 +119,16 @@ cd - cd bindings/python python setup.py build_ext \ - --include-dirs="$TMP/marisa-$VERSION/lib" \ - --library-dirs="$TMP/marisa-$VERSION/lib/.libs" || exit 1 + --include-dirs="$PKG/usr/include" \ + --library-dirs="$PKG/usr/lib${LIBDIRSUFFIX}" || exit 1 python setup.py install \ --root=$PKG || exit 1 cd - cd bindings/ruby ruby extconf.rb \ - --with-opt-include="$TMP/marisa-$VERSION/lib" \ - --with-opt-lib="$TMP/marisa-$VERSION/lib/.libs" \ + --with-opt-include="$PKG/usr/include" \ + --with-opt-lib="$PKG/usr/lib${LIBDIRSUFFIX}" \ --vendor make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/xpaint/xpaint.SlackBuild b/source/xap/xpaint/xpaint.SlackBuild index aee7b4ab..e4856175 100755 --- a/source/xap/xpaint/xpaint.SlackBuild +++ b/source/xap/xpaint/xpaint.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xpaint -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,7 +67,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 #if [ "$ARCH" = "x86_64" ]; then diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild index 8626f95a..e7b492b6 100755 --- a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild +++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxfce4ui VERSION=${VERSION:-$(echo $PKGNAM-*.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: MARCH=$( uname -m ) |