summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/kaffeine/README6
-rw-r--r--multimedia/kaffeine/doinst.sh4
-rw-r--r--multimedia/kaffeine/kaffeine.SlackBuild5
-rw-r--r--multimedia/kaffeine/kaffeine_locale.patch18
4 files changed, 19 insertions, 14 deletions
diff --git a/multimedia/kaffeine/README b/multimedia/kaffeine/README
index 41b22606d4..58f8e44484 100644
--- a/multimedia/kaffeine/README
+++ b/multimedia/kaffeine/README
@@ -1,3 +1,3 @@
-Kaffeine is a full featured Multimedia-Player for KDE. By default,
-it uses xine as backend. Kaffeine is free software distributed under
-the terms of the GNU General Public Licence.
+Kaffeine is a full featured Multimedia-Player for KDE. By default, it uses
+xine as backend. Kaffeine is free software distributed under the terms of
+the GNU General Public Licence.
diff --git a/multimedia/kaffeine/doinst.sh b/multimedia/kaffeine/doinst.sh
index faca4c917c..eec7ae1d81 100644
--- a/multimedia/kaffeine/doinst.sh
+++ b/multimedia/kaffeine/doinst.sh
@@ -1,4 +1,4 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- ./usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x usr/bin/update-desktop-database ]; then
+ usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
fi
diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild
index 96c7e90da4..c0d63cf02d 100644
--- a/multimedia/kaffeine/kaffeine.SlackBuild
+++ b/multimedia/kaffeine/kaffeine.SlackBuild
@@ -62,12 +62,15 @@ find . \
# Thanks to Eugene A. Bogoroditskiy
patch -p1 < $CWD/kaffeine_locale.patch
+# needed --with-extra-includes, otherwise it will not
+# find the cdparanoia headers.
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
- --localstatedir=/var
+ --localstatedir=/var \
+ --with-extra-includes=/usr/include/cdda
make
make install-strip DESTDIR=$PKG
diff --git a/multimedia/kaffeine/kaffeine_locale.patch b/multimedia/kaffeine/kaffeine_locale.patch
index 50d4d1eb25..736dfc9480 100644
--- a/multimedia/kaffeine/kaffeine_locale.patch
+++ b/multimedia/kaffeine/kaffeine_locale.patch
@@ -1,11 +1,13 @@
-diff -Naur kaffeine-0.8.7-orig/configure kaffeine-0.8.7/configure
---- kaffeine-0.8.7-orig/configure 2008-07-06 19:20:09.000000000 +0400
-+++ kaffeine-0.8.7/configure 2008-07-23 20:20:29.000000000 +0400
-@@ -2772,7 +2772,7 @@
-
-
+--- kaffeine-0.8.7-orig/configure 2008-07-06 15:20:09.000000000 +0000
++++ kaffeine-0.8.7/configure 2008-12-03 17:42:27.000000000 +0000
+@@ -2772,8 +2772,8 @@
+
+
# Define the identity of the package.
- PACKAGE=kaffeine-0.8.6
+- VERSION="3.5.7"
+ PACKAGE=kaffeine
- VERSION="3.5.7"
-
++ VERSION="3.5.10"
+
+
+ cat >>confdefs.h <<_ACEOF