aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorOlivier Esser <olive001@tele2allin.be>2010-05-11 22:24:41 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-11 22:24:41 +0200
commit37156f83d758263f5ad6170589a5a2be51c44545 (patch)
treeb939bcea1a2eb82329fb1abe2ba51287487964cd /multimedia
parent3e4d8e2f27dba1520cb3156d9aa662eae1481baa (diff)
multimedia/ekiga: Updated for version 2.0.12
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ekiga/configure_fix.diff13
-rw-r--r--multimedia/ekiga/ekiga-2.0.11-gcc4_fix.diff12
-rw-r--r--multimedia/ekiga/ekiga.SlackBuild40
-rw-r--r--multimedia/ekiga/ekiga.info6
4 files changed, 38 insertions, 33 deletions
diff --git a/multimedia/ekiga/configure_fix.diff b/multimedia/ekiga/configure_fix.diff
new file mode 100644
index 0000000000000..b82cbcd6f2112
--- /dev/null
+++ b/multimedia/ekiga/configure_fix.diff
@@ -0,0 +1,13 @@
+*** configure.orig 2008-06-19 01:04:37.000000000 +0200
+--- configure 2008-06-19 01:05:22.000000000 +0200
+***************
+*** 2970,2975 ****
+--- 2970,2977 ----
+ else
+ ENABLE_SK_TRUE="#"
+ ENABLE_SK_FALSE=""
++ HAVE_GNOME_DOC_UTILS_TRUE='#'
++ HAVE_GNOME_DOC_UTILS_FALSE=
+ fi
+
+
diff --git a/multimedia/ekiga/ekiga-2.0.11-gcc4_fix.diff b/multimedia/ekiga/ekiga-2.0.11-gcc4_fix.diff
deleted file mode 100644
index 2b31bead5c15a..0000000000000
--- a/multimedia/ekiga/ekiga-2.0.11-gcc4_fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur ekiga-2.0.11.orig/lib/gmconf/gmconf-glib.c ekiga-2.0.11/lib/gmconf/gmconf-glib.c
---- ekiga-2.0.11.orig/lib/gmconf/gmconf-glib.c 2007-09-18 04:00:21.000000000 -0500
-+++ ekiga-2.0.11/lib/gmconf/gmconf-glib.c 2007-12-09 01:50:26.380594315 -0600
-@@ -1473,7 +1473,7 @@
- }
-
- gboolean
--gm_conf_is_key_writable (gchar *key)
-+gm_conf_is_key_writable (const gchar *key)
- {
- g_return_val_if_fail (key != NULL, FALSE);
-
diff --git a/multimedia/ekiga/ekiga.SlackBuild b/multimedia/ekiga/ekiga.SlackBuild
index 1ea14fd9bfbf1..f041d477c0a94 100644
--- a/multimedia/ekiga/ekiga.SlackBuild
+++ b/multimedia/ekiga/ekiga.SlackBuild
@@ -4,14 +4,14 @@
# Written by Olivier Esser (olive001@tele2allin.be), based on
# the template available at slackbuilds.org (public domain)
-
# Modified by Robby Workman <rworkman@slackbuilds.org>
PRGNAM=ekiga
-VERSION=2.0.11
+VERSION=2.0.12
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -21,9 +21,11 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
-set -e # Exit on most errors
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -34,26 +36,29 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Small patch to allow building on gcc-4.x
-patch -p1 < $CWD/ekiga-2.0.11-gcc4_fix.diff
+# Fix a bug in the configure script that does not complete when
+# Gnome is disabled. This is a ugly hack; the proper way
+# would be to fix configure.in, but I am uncomfortable with autoconf.
+patch -p0 < $CWD/configure_fix.diff
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --disable-gnome \
- --disable-avahi
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-gnome \
+ --disable-avahi \
+ --disable-static \
+ --build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
@@ -61,9 +66,8 @@ make install DESTDIR=$PKG
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog FAQ INSTALL \
- LICENSE MAINTAINERS NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE \
+ MAINTAINERS NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/multimedia/ekiga/ekiga.info b/multimedia/ekiga/ekiga.info
index 8358069c9e4ef..a968003bac864 100644
--- a/multimedia/ekiga/ekiga.info
+++ b/multimedia/ekiga/ekiga.info
@@ -1,8 +1,8 @@
PRGNAM="ekiga"
-VERSION="2.0.11"
+VERSION="2.0.12"
HOMEPAGE="http://ekiga.org"
-DOWNLOAD="http://www.ekiga.org/admin/downloads/latest/sources/sources/ekiga-2.0.11.tar.gz"
-MD5SUM="684865225d77898e10e960f3a286b894"
+DOWNLOAD="http://www.ekiga.org/admin/downloads/latest/sources/sources/ekiga-2.0.12.tar.gz"
+MD5SUM="4df27d7715233984013fb9728db15ce8"
MAINTAINER="Olivier Esser"
EMAIL="olive001@tele2allin.be"
APPROVED="rworkman"