3 files changed, 9 insertions, 60 deletions
diff --git a/source/kde/amarok/amarok.SlackBuild b/source/kde/amarok/amarok.SlackBuild
index e7d60e69..2a6fc082 100755
--- a/source/kde/amarok/amarok.SlackBuild
+++ b/source/kde/amarok/amarok.SlackBuild
@@ -39,47 +39,14 @@ if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
   QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
 fi
 
-# If there's no libmysqld.a, we have to build it:
+# Notify the user if libmysqld.a (embedded mysql) is missing:
 if [ ! -r /usr/lib${LIBDIRSUFFIX}/mysql/libmysqld.a ]; then
-  MYSQL="$CWD/../../ap/mysql/mysql*.tar.?z*"
-  if [ ! -e "$MYSQL" ]; then
-    if [ -e "$CWD/mysql*.tar.?z*" ]; then
-      MYSQL="$CWD/mysql*.tar.?z*"
-    fi
-  fi
-  ( cd $TMP
-    tar xvf $MYSQL
-    MYSQLDIR="mysql-$(basename $(echo $MYSQL | rev | cut -f 1 -d - | rev) .tar.bz2)"
-    if [ -d "$MYSQLDIR" ]; then
-      cd "$MYSQLDIR"
-      CFLAGS=" $SLKCFLAGS -fPIC" CXXFLAGS=" $SLKCFLAGS -fPIC" \
-      ./configure \
-      --prefix=/usr \
-      --with-mysqld-user=mysql \
-      --with-unix-socket-path=/var/run/mysql/mysql.sock \
-      --localstatedir=/var/lib${LIBDIRSUFFIX}/mysql \
-      --enable-assembler \
-      --with-raid \
-      --without-debug \
-      --enable-thread-safe-client \
-      --without-bench \
-      --with-extra-charsets=complex \
-      --with-embedded-server \
-      --with-vio \
-      --with-pic \
-      --with-openssl \
-      --build=$ARCH-slackware-linux
-      make $NUMJOBS || make || exit 1
-      mkdir -p /usr/lib${LIBDIRSUFFIX}/mysql
-      cp libmysqld/libmysqld.a /usr/lib${LIBDIRSUFFIX}/mysql   
-    fi
-  )
-fi
-
-if [ ! -r /usr/lib${LIBDIRSUFFIX}/mysql/libmysqld.a ]; then
-  echo "ERROR:  No libmysqld.a.  Strongly advised to put a MySQL source .tar.bz2 in"
-  echo "this directory and try again..."
-  sleep 10
+  cat << EOF
+ERROR:  missing /usr/lib${LIBDIRSUFFIX}/mysql/libmysqld.a
+        please use mysql-embedded.build in source/ap/mysql/
+        to build and install this, and then try again.
+EOF
+  exit 1
 fi
 
 rm -rf $PKG
@@ -89,9 +56,6 @@ echo "Building amarok-$VERSION..."
 tar xvf $CWD/../src/extragear/amarok-$VERSION.tar.?z* || exit 1
 cd amarok-$VERSION
 
-# Make qtscript optional instead of required:
-#zcat $CWD/amarok.qtscript.optional.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -109,6 +73,7 @@ export QTSCRIPTS=/usr/lib${LIBDIRSUFFIX}/qt4/plugins/script
 mkdir -p build
 cd build
   cmake \
+    $KDE_OPT_ARGS \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/source/kde/amarok/amarok.qtscript.optional.diff b/source/kde/amarok/amarok.qtscript.optional.diff
deleted file mode 100644
index 1cf3af71..00000000
--- a/source/kde/amarok/amarok.qtscript.optional.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up amarok-2.0.90/CMakeLists.txt.qtscript_not_required amarok-2.0.90/CMakeLists.txt
---- amarok-2.0.90/CMakeLists.txt.qtscript_not_required	2009-04-06 16:29:12.000000000 -0500
-+++ amarok-2.0.90/CMakeLists.txt	2009-04-10 13:00:07.000000000 -0500
-@@ -38,8 +38,8 @@ if( WITH_PLAYER )
- 
-     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
- 
--    find_package( QtScriptQtBindings REQUIRED )
--    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
-+    macro_optional_find_package(QtScriptQtBindings)
-+    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
- 
-     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- 
diff --git a/source/kde/amarok/local.options b/source/kde/amarok/local.options
index 3b7a8b38..b086e127 100644
--- a/source/kde/amarok/local.options
+++ b/source/kde/amarok/local.options
@@ -1,3 +1 @@
-VERSION=2.1.1
-BUILD=1
-
+VERSION=2.3.0