audacious: => 3.9

6 files changed, 24 insertions, 27 deletions

diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index 27106913a0..48714718bb 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -1,15 +1,19 @@
 depends glib2 &&
-depends pango &&
-depends cairo &&
-depends gtk+3 &&
 
-optional_depends libguess \
-                 "--enable-chardet" "--disable-chardet" \
-                 "Enable libguess character set detection?" &&
+optional_depends gtk+2 \
+                 "--enable-gtk" \
+                 "--disable-gtk" \
+                 "for GTK+ interface" &&
+
+if is_depends_enabled ${SPELL} gtk+2; then
+  depends pango &&
+  depends cairo
+fi &&
 
 optional_depends dbus \
-                 "--enable-dbus" "--disable-dbus" \
-                 "support for dbus notifications" &&
+                 "--enable-dbus" \
+                 "--disable-dbus" \
+                 "for D-Bus notifications support" &&
 
 optional_depends gettext \
                  "--enable-nls" \
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index 3e65c1c138..0bd3fc6dd5 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,8 +1,8 @@
            SPELL=audacious
-         VERSION=3.5.2
+         VERSION=3.9
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
-     SOURCE_HASH=sha512:70fd5bf81fd86a867102917c9328e1e647e9566ecfbc773b15fe0d181f176cfb333976c817493b1e485f15a045da054f19a9d6d81106d55636fca14ac09f8008
+     SOURCE_HASH=sha512:d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://audacious-media-player.org"
       LICENSE[0]=GPL
diff --git a/audio-players/audacious/FINAL b/audio-players/audacious/FINAL
index 48dba5afa7..57e0f25f5f 100755
--- a/audio-players/audacious/FINAL
+++ b/audio-players/audacious/FINAL
@@ -1,3 +1,5 @@
 update_desktop_database &&
 
-gtk-update-icon-cache -q -t -f "${INSTALL_ROOT}/usr/share/icons/hicolor"
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q -t -f "${INSTALL_ROOT}/usr/share/icons/hicolor"
+fi
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index fb9c6d4995..ac4d82971b 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,10 @@
+2017-09-11 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 3.9
+	* DEPENDS: switched back to gtk+2 -- becomes optional; removed chardet
+	* PRE_BUILD: dropped, no longer needed
+	* FINAL: add condition for gtk-update-icon-cache
+	* LC_ALL-fix.patch: dropped, unsupported
+
 2017-09-09 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 3.5.2; updated descriptions; quoting
 	  paths
diff --git a/audio-players/audacious/LC_ALL-fix.patch b/audio-players/audacious/LC_ALL-fix.patch
deleted file mode 100644
index e43ccd4486..0000000000
--- a/audio-players/audacious/LC_ALL-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100755
index 9544f90ffa..0000000000
--- a/audio-players/audacious/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-
-patch -p1 < $SPELL_DIRECTORY/LC_ALL-fix.patch