summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2013-07-09 23:25:22 -0500
committerRobby Workman <rworkman@slackbuilds.org>2013-10-29 23:31:35 -0500
commitdc418d20d5450b2e51f0af0459be5ee71872d610 (patch)
treeb0d009e20176f358fc79a2b3fa210dda1d3a012d
parentfde69dfe4b535dab91eaef87f0a89458b6cb627b (diff)
downloadslackbuilds-dc418d20d5450b2e51f0af0459be5ee71872d610.tar.gz
libraries/gmtk: Use dconf instead of gconf
Since dconf is GConf's replacement, and it's shipped in Slackware 14.1, we should use it. Whether we should switch this to use gtk3 is another issue entirely :-) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--libraries/gmtk/README4
-rw-r--r--libraries/gmtk/gmtk.SlackBuild13
2 files changed, 1 insertions, 16 deletions
diff --git a/libraries/gmtk/README b/libraries/gmtk/README
index 3fe8a99e02..14860b86d1 100644
--- a/libraries/gmtk/README
+++ b/libraries/gmtk/README
@@ -9,7 +9,3 @@ other applications. Those widgets are
gmtk_audio_meter - a audio visualization tool
gmtk_output_combobox - a widget for selecting audio outputs
(alsa and pulse compatible)
-
-It uses GConf to save its setting, but it can use the optional
-dependency dconf for it: in this case pass the switch DCONF="YES"
-to the script.
diff --git a/libraries/gmtk/gmtk.SlackBuild b/libraries/gmtk/gmtk.SlackBuild
index 276c24eb65..ade1a1d8de 100644
--- a/libraries/gmtk/gmtk.SlackBuild
+++ b/libraries/gmtk/gmtk.SlackBuild
@@ -21,10 +21,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# Assume we're using gconf unless otherwise specified
-# set to "YES" to use dconf
-DCONF=${DCONF:-NO}
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -54,13 +50,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-o -perm 400 \) -exec chmod 644 {} \;
-# If DCONF=YES above, then disable gconf; otherwise, enable it.
-if [ "$DCONF" = "YES" ]; then
- do_gconf="disable"
- else
- do_gconf="enable"
-fi
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -68,7 +57,7 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --${do_gconf}-gconf \
+ --disable-gconf \
--disable-gtk3 \
--build=$ARCH-slackware-linux