audacious: updated to 3.3.2

9 files changed, 31 insertions, 18 deletions

diff --git a/audio-players/audacious/BUILD b/audio-players/audacious/BUILD
deleted file mode 100755
index 3f0e2f2dc3..0000000000
--- a/audio-players/audacious/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="${AUDACIOUS_IPV6} --enable-chardet $OPTS" &&
-default_build
diff --git a/audio-players/audacious/CONFIGURE b/audio-players/audacious/CONFIGURE
deleted file mode 100755
index c95492cdb9..0000000000
--- a/audio-players/audacious/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option AUDACIOUS_IPV6 "Enable IPv6 support?" n \
-                    "--enable-ipv6" "--disable-ipv6"
diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index 4799d9d609..c9e85778f0 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -1,22 +1,16 @@
-depends gtk+2 &&
-depends libglade2 &&
-depends libmcs &&
-depends libmowgli &&
+depends glib2 &&
 depends pango &&
 depends cairo &&
+depends gtk+3 &&
 
-optional_depends gtk+3 \
-                 "" "--disable-gtk3" \
-                 "to use GTK3 instead of GTK2" &&
+optional_depends libguess \
+                 "--enable-chardet" "--disable-chardet" \
+                 "Enable libguess character set detection?" &&
 
-optional_depends libsamplerate \
-                 "--enable-samplerate" \
-                 "--disable-samplerate" \
-                 "support for samplerate" &&
 optional_depends dbus \
-                 "--enable-dbus" \
-                 "--disable-dbus" \
+                 "--enable-dbus" "--disable-dbus" \
                  "support for dbus notifications" &&
+
 optional_depends pcre \
                  "--with-regexlib=pcre" \
                  "--with-regexlib=gnu" \
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index f4135c0b1e..1f16b1542d 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,5 +1,5 @@
            SPELL=audacious
-         VERSION=3.2.3
+         VERSION=3.3.2
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index fcc5bc2cc2..e40ec0e232 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,10 @@
+2012-10-19 Robin Cook <rcook@wyrms.net>
+	* DETAILS: updated VERSION to 3.3.2
+	* DEPENDS: updated with changed depends
+	* BUILD: removed
+	* CONFIGURE: removed
+	* PRE_BUILD: added to apply patch
+
 2012-07-26 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: added missing gtk+3 dependency
 
diff --git a/audio-players/audacious/LC_ALL-fix.patch b/audio-players/audacious/LC_ALL-fix.patch
new file mode 100644
index 0000000000..e43ccd4486
--- /dev/null
+++ b/audio-players/audacious/LC_ALL-fix.patch
@@ -0,0 +1,12 @@
+diff -ur audacious-orig/src/audacious/main.c audacious-3.3.2/src/audacious/main.c
+--- audacious-orig/src/audacious/main.c	2012-10-19 20:21:07.223245571 -0500
++++ audacious-3.3.2/src/audacious/main.c	2012-10-19 20:21:57.147245213 -0500
+@@ -439,7 +439,7 @@
+     init_paths ();
+     make_dirs ();
+ 
+-    setlocale (LC_ALL, "");
++//    setlocale (LC_ALL, "");
+     bindtextdomain (PACKAGE, aud_paths[AUD_PATH_LOCALE_DIR]);
+     bind_textdomain_codeset (PACKAGE, "UTF-8");
+     bindtextdomain (PACKAGE "-plugins", aud_paths[AUD_PATH_LOCALE_DIR]);
diff --git a/audio-players/audacious/PRE_BUILD b/audio-players/audacious/PRE_BUILD
new file mode 100755
index 0000000000..9544f90ffa
--- /dev/null
+++ b/audio-players/audacious/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+
+patch -p1 < $SPELL_DIRECTORY/LC_ALL-fix.patch
diff --git a/audio-players/audacious/audacious-3.2.3.tar.bz2.sig b/audio-players/audacious/audacious-3.2.3.tar.bz2.sig
deleted file mode 100644
index b93ed298ab..0000000000
--- a/audio-players/audacious/audacious-3.2.3.tar.bz2.sig
+++ /dev/null
diff --git a/audio-players/audacious/audacious-3.3.2.tar.bz2.sig b/audio-players/audacious/audacious-3.3.2.tar.bz2.sig
new file mode 100644
index 0000000000..067a6605b5
--- /dev/null
+++ b/audio-players/audacious/audacious-3.3.2.tar.bz2.sig