From f938d44c4e921b58db539dab602b82d13f06da8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 2 Sep 2017 12:11:30 +0200
Subject: Install path fix


diff --git a/configure.ac b/configure.ac
index 990d93c..068bea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,7 +626,7 @@ fi
 
 dnl *** End of all plugin checks ***
 
-plugindir=`pkg-config audacious --variable=plugin_dir`
+plugindir="$libdir/audacious"
 AC_SUBST(plugindir)
 
 dnl XXX
-- 
2.13.1


From 1d2cf3a4c285401e1414d4d508b1596e9e03be55 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 2 Sep 2017 17:24:06 +0300
Subject: enable icons in qtgui


diff --git a/src/qtui/Makefile b/src/qtui/Makefile
index 6576ef7..b6dae72 100644
--- a/src/qtui/Makefile
+++ b/src/qtui/Makefile
@@ -22,7 +22,7 @@ include ../../extra.mk
 # These overrides variables in buildsys.mk and so must come after it.
 PACKAGE_NAME = audacious
 
-CUSTOM_ICONS=no
+CUSTOM_ICONS=yes
 ifeq ($(HAVE_MSWINDOWS),yes)
 CUSTOM_ICONS=yes
 endif
diff --git a/src/qtui/main_window.cc b/src/qtui/main_window.cc
index 4a16a65..593b19b 100644
--- a/src/qtui/main_window.cc
+++ b/src/qtui/main_window.cc
@@ -95,7 +95,7 @@ MainWindow::MainWindow () :
     m_search_tool (aud_plugin_lookup_basename ("search-tool-qt")),
     m_playlist_manager (aud_plugin_lookup_basename ("playlist-manager-qt"))
 {
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
     QIcon::setThemeName ("QtUi");
 
     QStringList paths = QIcon::themeSearchPaths ();
-- 
2.13.1