musescore: updated to 3.5.2

1 files changed, 44 insertions, 23 deletions

diff --git a/musescore/build/musescore.SlackBuild b/musescore/build/musescore.SlackBuild
index a769c65d..6955efbb 100755
--- a/musescore/build/musescore.SlackBuild
+++ b/musescore/build/musescore.SlackBuild
@@ -49,6 +49,10 @@
 #              * Update.
 # 3.5-1:       08/aug/2020 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 3.5.1-1:     10/oct/2020 by Eric Hameleers <alien@slackware.com>
+#              * Update.
+# 3.5.2-1:     17/oct/2020 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh musescore.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -58,7 +62,7 @@
 
 SRCNAM=MuseScore
 PRGNAM=musescore
-VERSION=${VERSION:-3.5.0}
+VERSION=${VERSION:-3.5.2}
 MAJVER=$(echo $VERSION |cut -d. -f1,2)
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
@@ -74,8 +78,11 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${SRCNAM}-${VERSION}.zip"
-SRCURL="https://github.com/${PRGNAM}/${SRCNAM}/releases/download/v${MAJVER}/${SRCNAM}-${VERSION}.zip"
+SOURCE[0]="$SRCDIR/${SRCNAM}-${VERSION}.tar.gz"
+SRCURL[0]="https://github.com/${PRGNAM}/${SRCNAM}/archive/v${VERSION}.tar.gz"
+
+SOURCE[1]="$SRCDIR/MuseScore_General.sf3"
+SRCURL[1]="https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -133,24 +140,26 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
-if ! [ -f ${SOURCE} ]; then
-  echo "Source '$(basename ${SOURCE})' not available yet..."
-  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
-  if ! [ "x${SRCURL}" == "x" ]; then
-    echo "Will download file to $(dirname $SOURCE)"
-    wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
-      mv -f "${SOURCE}" "${SOURCE}".FAIL
+for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
+  if ! [ -f ${SOURCE[$i]} ]; then
+    echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+    if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
+    if ! [ "x${SRCURL[$i]}" == "x" ]; then
+      echo "Will download file to $(dirname $SOURCE[$i])"
+      wget --no-check-certificate -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
+        echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
+        mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
+        exit 1
+      fi
+    else
+      echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
       exit 1
     fi
-  else
-    echo "File '$(basename ${SOURCE})' not available... aborting the build."
-    exit 1
   fi
-fi
+done
 
 if [ "$P1" == "--download" ]; then
   echo "Download complete."
@@ -165,9 +174,11 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-mkdir -p ${PRGNAM}-${VERSION}
-cd ${PRGNAM}-${VERSION}
-unzip -q ${SOURCE}
+tar xf ${SOURCE[0]}
+cd ${SRCNAM}-${VERSION}
+
+# Add the soundfont:
+install -D -m0644 ${SOURCE[1]} ./share/sound/
 
 # Prevent an installation error:
 sed -e 's/MuseScore_General-License.md/MuseScore_General_License.md/g' \
@@ -204,6 +215,8 @@ cd build-musescore
     -DBUILD_PORTAUDIO="ON" \
     -DBUILD_PORTMIDI="ON" \
     -DBUILD_WEBENGINE="ON" \
+    -DDOWNLOAD_SOUNDFONT="OFF" \
+    -DMUSESCORE_BUILD_CONFIG="release" \
     -DUSE_SYSTEM_FREETYPE="ON" \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
   make \
@@ -217,6 +230,14 @@ cd -
 rm -rf $PKG/usr/lib/qt5
 rmdir $PKG/usr/lib 2>/dev/null || true
 
+# Add 'X-DAW' category to the desktop file (for liveslak):
+for DESKTOPF in $PKG/usr/share/applications/*.desktop ; do
+  if ! grep -q X-DAW $DESKTOPF ; then
+    sed -i $DESKTOPF \
+      -e "s/^Categories=\(.*\)/Categories=X-DAW;\1/"
+  fi
+done
+
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh
@@ -260,9 +281,9 @@ cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep