From 0187f40ca0e28888c00cc3a246359e356dcb930e Mon Sep 17 00:00:00 2001
From: arvenil <arvenil@pld-linux.org>
Date: Sat, 15 Mar 2008 09:54:39 +0000
Subject: [PATCH] - up to 1.5.0

Changed files:
    audacious-home_etc.patch -> 1.6
---
 audacious-home_etc.patch | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch
index 0d2702c..b49e76d 100644
--- a/audacious-home_etc.patch
+++ b/audacious-home_etc.patch
@@ -1,15 +1,13 @@
---- audacious-1.4.0/src/audacious/Makefile	2007-01-26 18:58:10.000000000 +0100
-+++ audacious-1.4.0/src/audacious/Makefile	2007-01-26 18:59:45.000000000 +0100
-@@ -189,7 +189,8 @@
+--- audacious-1.5.0/src/audacious/Makefile	2008-03-13 22:19:27.000000000 +0000
++++ audacious-1.5.0/src/audacious/Makefile	2008-03-15 10:04:11.000000000 +0000
+@@ -180,6 +180,7 @@
+ 	${DBUS_LIBS}		\
  	${MOWGLI_LIBS}		\
  	${LIBMCS_LIBS}		\
- 	${LIBGLADE_LIBS}	\
--	${REGEX_LIBS}
-+	${REGEX_LIBS}		\
-+	-lhome_etc
++	-lhome_etc		\
+ 	${REGEX_LIBS}
  
  LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
- 
 --- audacious-1.3.0/src/audacious/configdb.h	2007-01-26 18:58:10.000000000 +0100
 +++ audacious-1.3.0/src/audacious/configdb.h	2007-01-26 19:01:51.000000000 +0100
 @@ -2,6 +2,7 @@
@@ -58,3 +56,18 @@
    else
      datadir = g_build_filename( tmp , "audacious" , NULL );
  
+--- audacious-1.5.0/src/audacious/skin.c	2008-03-13 22:19:27.000000000 +0000
++++ audacious-1.5.0/src/audacious/skin.c	2008-03-15 10:07:26.000000000 +0000
+@@ -1482,10 +1482,10 @@
+ 
+     /* the way GTK does things can be very broken. --nenolod */
+ 
+-    gchar *tmp = g_strdup_printf("%s/.themes/aud-%s", g_get_home_dir(),
++    gchar *tmp = g_strdup_printf("%s/.themes/aud-%s", _HEdir,
+                                  basename(skin->path));
+ 
+-    gchar *troot = g_strdup_printf("%s/.themes", g_get_home_dir());
++    gchar *troot = g_strdup_printf("%s/.themes", _HEdir);
+     g_mkdir_with_parents(troot, 0755);
+     g_free(troot);
+ 
-- 
2.44.0