fixed error in lxqt.SlackBuild that was preventing eventual patches to be applied

[lxqt-slackware.git] / lxqt.SlackBuild

diff --git a/lxqt.SlackBuild b/lxqt.SlackBuild
index e4fc66a..e7249ba 100755 (executable)
--- 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,29 +107,32 @@ 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
 
 # If any patches are needed, call this script to apply them:
 if [ -r $CWD/patch/${PROGRAM}.patch ]; then
-  . $CWD/patch/${PROGRAM}.patch || exit 1
+  patch -p1 < $CWD/patch/${PROGRAM}.patch || exit 1
 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