1 files changed, 23 insertions, 18 deletions
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index d04d2fb905..8dfad24c8d 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for ardour
 
 # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2018-2021 Matteo Bernardini, Pisa, Italy
+# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230703 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - make .desktop file validate.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ardour
-VERSION=${VERSION:-6.9}
+VERSION=${VERSION:-8.6.0}
+MAJVER=$(echo $VERSION | cut -d. -f1)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -57,9 +61,6 @@ else
   TARGET="$ARCH"
 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 "$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -80,14 +81,14 @@ cd Ardour-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-patch -p1 < $CWD/vendor_qm-dsp.patch
+sed -i "s|env\ python|env\ python3|" waf wscript
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \
+CXXFLAGS="$SLKCFLAGS" \
 ./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -99,10 +100,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \
   --optimize \
   --freedesktop \
   --no-phone-home \
-  --nls \
-  --ptformat \
-  --lxvst \
-  --cxx11
+  --ptformat
 
 ./waf build
 
@@ -112,12 +110,19 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/share/{appdata,applications,icons}
-cp build/gtk2_ardour/ardour6.appdata.xml $PKG/usr/share/appdata/
-cp build/gtk2_ardour/ardour6.desktop $PKG/usr/share/applications/
+cp build/gtk2_ardour/ardour$MAJVER.appdata.xml $PKG/usr/share/appdata/
+
+# 20230703 bkw: desktop-file-validate complained about Categories.
+# The desktop menu spec:
+# https://specifications.freedesktop.org/menu-spec/latest/apa.html
+# ...has no such category as AudioEditing.
+sed 's,AudioEditing;,X-&,' build/gtk2_ardour/ardour$MAJVER.desktop \
+  > $PKG/usr/share/applications/ardour$MAJVER.desktop
+
 for isize in 16 22 32 48 ; do
   mkdir -p $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps
   cp gtk2_ardour/icons/application-x-ardour_${isize}px.png \
-    $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour6.png
+    $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour$MAJVER.png
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -130,10 +135,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Let's not clobber config files
-cd $PKG/etc/ardour6
+cd $PKG/etc/ardour$MAJVER
   for i in $(find . -type f) ; do
     mv $i $i.new
-    echo "config etc/ardour6/$i.new" >> $PKG/install/doinst.sh
+    echo "config etc/ardour$MAJVER/$i.new" >> $PKG/install/doinst.sh
   done
 cd -