- reverted last commit

[packages/audacious.git] / audacious-home_etc.patch

diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch
index 31e21c5a62b2255ce0609ef9b442ad92d4d73340..e9ebde96ea473d355b75879591f3205019104a0c 100644 (file)
--- a/audacious-home_etc.patch
+++ b/audacious-home_etc.patch
@@ -1,54 +1,62 @@
---- bmp-0.9.7.1/audacious/Makefile.am.orig     2005-08-09 02:41:52.000000000 +0200
-+++ bmp-0.9.7.1/audacious/Makefile.am  2005-11-01 10:33:17.554845704 +0100
-@@ -11,7 +11,8 @@
-       $(GTK_LIBS)      \
-       $(LIBGLADE_LIBS) \
-       $(LTLIBINTL)     \
--      $(top_builddir)/libaudacious/libaudacious.la
-+      $(top_builddir)/libaudacious/libaudacious.la \
-+      -lhome_etc
- 
- audacious_CFLAGS = \
-       $(X_CFLAGS)        \
---- bmp-0.9.7.1/audacious/main.c.orig  2005-08-27 13:20:04.000000000 +0200
-+++ bmp-0.9.7.1/audacious/main.c       2005-11-01 10:38:05.469076088 +0100
-@@ -72,6 +72,7 @@
- #include "pixmaps.h"
- #include "images/bmp_player.xpm"
+diff -burNp audacious-2.1/src/audacious/configdb.h audacious-2.1-dud/src/audacious/configdb.h
+--- audacious-2.1/src/audacious/configdb.h     2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/configdb.h 2009-08-23 12:50:48.874454861 +0200
+@@ -3,6 +3,7 @@
  
+ #include <glib.h>
+ #include <libmcs/mcs.h>
 +#include <home_etc.h>
  
- /* Translatable string for audacious.desktop's comment field */
- const gchar *desktop_comment = N_("Beep Media Player");
-@@ -402,7 +403,7 @@
- static void
- bmp_init_paths(void)
- {
--    bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL);
-+    bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(_HEdir, BMP_RCPATH, NULL);
- 
-     bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = USER_PATH(BMP_USER_PLUGIN_DIR_BASENAME);
-     bmp_paths[BMP_PATH_USER_SKIN_DIR] = USER_PATH(BMP_SKIN_DIR_BASENAME);
---- bmp-0.9.7.1/libaudacious/Makefile.am.orig  2005-08-09 02:41:53.000000000 +0200
-+++ bmp-0.9.7.1/libaudacious/Makefile.am       2005-11-01 10:41:02.170213432 +0100
-@@ -10,7 +10,8 @@
- libaudacious_la_LIBADD = \
-       $(GTK_LIBS)      \
-       $(GCONF_LIBS)    \
--      $(GNOMEVFS_LIBS)
-+      $(GNOMEVFS_LIBS) \
-+      -lhome_etc
- 
- INCLUDES = \
-       $(GTK_CFLAGS)        \
---- bmp-0.9.7.1/libaudacious/configdb_rcfile.c~        2005-11-01 10:30:32.056005352 +0100
-+++ bmp-0.9.7.1/libaudacious/configdb_rcfile.c 2005-11-01 10:42:07.430292392 +0100
-@@ -41,7 +41,7 @@
-     ConfigDb *db;
- 
-     db = g_new(ConfigDb, 1);
--    db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH, 
-+    db->filename = g_build_filename(_HEdir, BMP_RCPATH, 
-                                     "config", NULL);
-     db->file = bmp_rcfile_open(db->filename);
-     if (!db->file)
+ G_BEGIN_DECLS
+ 
+diff -burNp audacious-2.1/src/audacious/main.c audacious-2.1-dud/src/audacious/main.c
+--- audacious-2.1/src/audacious/main.c 2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/main.c     2009-08-23 12:52:28.224445099 +0200
+@@ -137,13 +137,13 @@ aud_init_paths()
+     char *xdg_cache_home;
+ 
+     xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL
+-        ? g_build_filename(g_get_home_dir(), ".config", NULL)
++      ? g_build_filename(_HEdir, ".config", NULL)
+         : g_strdup(getenv("XDG_CONFIG_HOME")));
+     xdg_data_home = (getenv("XDG_DATA_HOME") == NULL
+-        ? g_build_filename(g_get_home_dir(), ".local", "share", NULL)
++      ? g_build_filename(_HEdir, ".local", "share", NULL)
+         : g_strdup(getenv("XDG_DATA_HOME")));
+     xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL
+-        ? g_build_filename(g_get_home_dir(), ".cache", NULL)
++      ? g_build_filename(_HEdir, ".cache", NULL)
+         : g_strdup(getenv("XDG_CACHE_HOME")));
+ 
+     aud_paths[BMP_PATH_USER_DIR] =
+diff -burNp audacious-2.1/src/audacious/Makefile audacious-2.1-dud/src/audacious/Makefile
+--- audacious-2.1/src/audacious/Makefile       2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/Makefile   2009-08-23 12:50:22.564458775 +0200
+@@ -168,6 +168,7 @@ LIBS += ${LDADD}                                           \
+               ${DBUS_LIBS}                                    \
+               ${MOWGLI_LIBS}                                  \
+               ${LIBMCS_LIBS}                                  \
++              -lhome_etc                                      \
+               ${REGEX_LIBS}
+ 
+ LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
+diff -burNp audacious-2.1/src/audacious/util.c audacious-2.1-dud/src/audacious/util.c
+--- audacious-2.1/src/audacious/util.c 2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/util.c     2009-08-23 12:53:44.297770774 +0200
+@@ -32,6 +32,7 @@
+ #include "util.h"
+ 
+ #include <glib.h>
++#include <home_etc.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+@@ -932,7 +933,7 @@ util_get_localdir(void)
+   gchar *tmp;
+ 
+   if ( (tmp = getenv("XDG_CONFIG_HOME")) == NULL )
+-    datadir = g_build_filename( g_get_home_dir() , ".config" , "audacious" ,  NULL );
++    datadir = g_build_filename( _HEdir , ".config" , "audacious" ,  NULL );
+   else
+     datadir = g_build_filename( tmp , "audacious" , NULL );
+