4 files changed, 41 insertions, 8 deletions
diff --git a/audio/guitarix/README b/audio/guitarix/README
index 7907bb4549..365e6deeed 100644
--- a/audio/guitarix/README
+++ b/audio/guitarix/README
@@ -9,10 +9,8 @@ architectures, SSE will be used if available.
 
 meterbridge is an optional runtime dependency.
 
-Starting with version 0.34.0, guitarix can browse and download presets
-from the web, using the 'Online' button in the preset selector. To
-enable this feature, install webkitgtk before building guitarix (it will
-be autodetected).
+Starting with version 0.35.4, guitarix's 'Online presets' feature no
+longer requires webkitgtk. See README.online for more information.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/guitarix/README.online b/audio/guitarix/README.online
new file mode 100644
index 0000000000..01bd317665
--- /dev/null
+++ b/audio/guitarix/README.online
@@ -0,0 +1,28 @@
+In case you have trouble downloading presets with the 'Online' button:
+
+1. Make sure the site is actually up. Open https://musical-artifacts.com
+   in a browser. If it won't load at all, the site might be down. Also
+   if you see a 'too many users' error, wait a while and it should work
+   again. Hopefully. Anyway there's not much you can do about it :(
+
+2. If the site works fine in a browser, but you get 'Operation not supported'
+   in guitarix, it's probably a dbus error. The file /etc/rc.d/rc.dbus
+   should be executable, and when you start your X session, it needs
+   to be running within a dbus session. Most of the window manager
+   startup scripts in /etc/X11/xinit/xinit.* already do this (KDE,
+   XFCE, WindowMaker, and FVWM2, but not fluxbox or twm), but if you
+   have a custom ~/.xinitrc, you might need to edit it to add dbus
+   support. See /etc/X11/xinit/xinitrc.fvwm2 for an example of how to do
+   this. Note that it's NOT enough for the system dbus to be running,
+   or a user instance spawned by some X application: dbus-launch sets
+   environment variables, and your window manager needs to have them
+   set in its environment! If you're not sure, launch a terminal in your
+   X session and type:
+
+   echo $DBUS_SESSION_BUS_ADDRESS
+
+   If you get a string of gobbledegook similar to this:
+
+   unix:abstract=/tmp/dbus-mrYuKLNcnn,guid=2bbb2710726acb1cdbc4511f59641e0a
+
+   ...then all is well with dbus. If you get no output, fix your .xinitrc.
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild
index 41cfa07e44..87fd16ddf6 100644
--- a/audio/guitarix/guitarix.SlackBuild
+++ b/audio/guitarix/guitarix.SlackBuild
@@ -6,6 +6,13 @@
 # Modified by B. Watson <yalhcru@gmail.com>. Modified version released
 # under the WTFPL, for details see http://www.wtfpl.net/txt/copying/
 
+# 20170710 bkw:
+# - Updated for 0.35.4
+# - Remove README stuff about webkitgtk, since upstream dropped it.
+# - Add README.online with troubleshooting info. I had trouble
+#   getting the new Online Presets stuff to work, so hopefully this
+#   might help the next guy.
+
 # 20170404 bkw:
 # - Updated for 0.35.3
 # - Use + rather than ; in find/chmod. Noticeably faster.
@@ -77,7 +84,7 @@
 # - Add guitarix's README to /usr/doc
 
 PRGNAM=guitarix
-VERSION=${VERSION:-0.35.3}
+VERSION=${VERSION:-0.35.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info
index b503815813..1f9930872d 100644
--- a/audio/guitarix/guitarix.info
+++ b/audio/guitarix/guitarix.info
@@ -1,8 +1,8 @@
 PRGNAM="guitarix"
-VERSION="0.35.3"
+VERSION="0.35.4"
 HOMEPAGE="http://guitarix.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.35.3.tar.xz"
-MD5SUM="d073e551b2da7d339e738f932150d581"
+DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.35.4.tar.xz"
+MD5SUM="959aa6a1706a955ecf7a5052f93a0afc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblrdf lilv"