From 21f84fc8e7f70072e7db64cb30470e86f90a4612 Mon Sep 17 00:00:00 2001
From: Kyle Guinn <elyk03@gmail.com>
Date: Sun, 23 Dec 2012 07:14:30 +0100
Subject: multimedia/gnash: Added a switch to disable the konqueror plugin.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 multimedia/gnash/README           |  6 +++++-
 multimedia/gnash/gnash.SlackBuild | 22 +++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/gnash/README b/multimedia/gnash/README
index 36b7c8478a..34bf64040a 100644
--- a/multimedia/gnash/README
+++ b/multimedia/gnash/README
@@ -1,5 +1,9 @@
 Gnash is the GNU SWF movie player, which can be run standalone on the
 desktop or an embedded device, as well as as a plugin for several browsers.
 
+If you don't want to compile it or if you don't have KDE installed,
+you can disable the Konqueror plugin ("Klash") like this:
+	KLASH=no ./gnash.SlackBuild
+
 Optional but recommended dependencies are speex, gst-ffmpeg,
-and gst-plugins-ugly
+and gst-plugins-ugly.
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index 9f1fb359c3..679769f480 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=gnash
 VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -56,6 +56,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Set $KLASH to "no" to disable Klash, the Konqueror plugin.
+if [ "${KLASH:-yes}" = "yes" ]; then
+  KLASH_OPT="\
+  --with-kde4-incl=/usr/include \
+  --with-kde4-configdir=/usr/share/config \
+  --with-kde4-prefix=/usr \
+  --with-kde4-lib=/usr/lib${LIBDIRSUFFIX} \
+  --with-kde-appsdatadir=/usr/share/apps/klash \
+  --with-kde4-servicesdir=/usr/share/kde4/services"
+else
+  KLASH_OPT="--disable-kparts3 --disable-kparts4"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -94,12 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-write \
   --without-gconf \
   --with-plugins-install=system \
-  --with-kde4-incl=/usr/include \
-  --with-kde4-configdir=/usr/share/config \
-  --with-kde4-prefix=/usr \
-  --with-kde4-lib=/usr/lib$LIBDIRSUFFIX \
-  --with-kde-appsdatadir=/usr/share/apps/klash \
-  --with-kde4-servicesdir=/usr/share/kde4/services
+  $KLASH_OPT
 
 make
 make install-strip install-plugins DESTDIR=$PKG
-- 
cgit v1.2.3