X-Git-Url: https://git.danix.xyz/?a=blobdiff_plain;f=lxqt.SlackBuild;h=79218290cce18832c8c357ac165666cb91dd33e4;hb=406a654fb80a0b8200c3e8159987ca49dafa0f3f;hp=e4fc66a515c317e4bda8b36a329f28e4ff1bc990;hpb=73c8ba7df61f415c9f63472dca525d059d77faca;p=lxqt-slackware.git diff --git a/lxqt.SlackBuild b/lxqt.SlackBuild index e4fc66a..7921829 100755 --- a/lxqt.SlackBuild +++ b/lxqt.SlackBuild @@ -89,7 +89,11 @@ no_usr_share_doc() { } PROGRAM=$1 -VERSION=${VERSION:-0.15.0} +SOURCE=$PROGRAM +if [[ $PROGRAM == 'libfm-extra' ]]; then + SOURCE='libfm' +fi +VERSION=${VERSION:-0.16.0} PKG="$BUILD_DIR/package-${PROGRAM}" # Import the build configuration options for as far as they are not already set: @@ -103,12 +107,12 @@ PKGARCH=$ARCH # Perhaps $PKGARCH should be something different: if grep -wq "^${PROGRAM}$" ${CWD}/noarch ; then PKGARCH=noarch -fi +fi rm -rf "$PKG" "$TMP/${PROGRAM}-$VERSION" cd "$TMP" -cp -R ${CWD}/src/${PROGRAM} $TMP/${PROGRAM}-$VERSION +cp -R ${CWD}/src/${SOURCE} $TMP/${PROGRAM}-$VERSION cd "${PROGRAM}"-$VERSION fix_perms @@ -120,12 +124,15 @@ fi # Check autotools builds before continuing with cmake programs if [ -r $CWD/autotools/${PROGRAM} ]; then + echo "sourcing autotools settings for $PROGRAM" . $CWD/autotools/${PROGRAM} else if [ -r $CWD/cmake/${PROGRAM} ]; then + echo "sourcing cmake settings for $PROGRAM" . $CWD/cmake/${PROGRAM} else # This is the default configure script: + echo "setting generic cmake for $PROGRAM" . $CWD/cmake/cmake fi fi @@ -156,7 +163,7 @@ fi cd $PKG process_man_pages process_info_pages -no_usr_share_doc +no_usr_share_doc mkdir -p $PKG/install if [ -r $CWD/slack-desc/${PROGRAM} ]; then cat $CWD/slack-desc/${PROGRAM} > $PKG/install/slack-desc