- updated to ver. 1.3.1 thanks for Kamil Dziedzic <kamil.listy@klecza.pl>

Changed files:
    audacious-desktop.patch -> 1.6
    audacious-home_etc.patch -> 1.4

diff --git a/audacious-desktop.patch b/audacious-desktop.patch
index 5a0a97cceed02b83c1125973e135de320a88eeed..c6173c7c06a50b7071581cb133fca41959db5168 100644 (file)
--- a/audacious-desktop.patch
+++ b/audacious-desktop.patch
@@ -1,16 +1,15 @@
-diff -urN audacious-1.2.2/audacious/audacious.desktop.in audacious-1.2.2.new/audacious/audacious.desktop.in
---- audacious-1.2.2/audacious/audacious.desktop.in     2006-11-16 20:46:06.000000000 +0100
-+++ audacious-1.2.2.new/audacious/audacious.desktop.in 2006-11-19 13:55:33.000000000 +0100
+diff -urN audacious-1.2.2/src/audacious/audacious.desktop.in audacious-1.2.2.new/src/audacious/audacious.desktop.in
+--- audacious-1.2.2/src/audacious/audacious.desktop.in 2006-11-16 20:46:06.000000000 +0100
++++ audacious-1.2.2.new/src/audacious/audacious.desktop.in     2006-11-19 13:55:33.000000000 +0100
 @@ -2,10 +2,11 @@
  Name=Audacious
  Comment=Play music
  Comment[hu]=Zene lejátszása
 +Comment[pl]=Odtwarzacz muzyki
- Exec=audacious
--Icon=audacious.png
+ Exec=audacious %U
+ Icon=audacious
 -MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg
 -Categories=Application;GTK;AudioVideo;Player;
-+Icon=audacious
 +MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg;
 +Categories=GTK;Audio;Player;
  Terminal=false

diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch
index 81e5c2b87f7a7e6607932700bf07602010a608c7..383fe576daf7e3e46892b879c59bddc5b9362c73 100644 (file)
--- a/audacious-home_etc.patch
+++ b/audacious-home_etc.patch
@@ -1,72 +1,70 @@
-diff -urN audacious-1.2.2/audacious/main.c audacious-1.2.2.new/audacious/main.c
---- audacious-1.2.2/audacious/main.c   2006-11-12 10:55:56.000000000 +0100
-+++ audacious-1.2.2.new/audacious/main.c       2006-11-19 12:57:09.000000000 +0100
-@@ -476,7 +476,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);
-diff -urN audacious-1.2.2/audacious/Makefile audacious-1.2.2.new/audacious/Makefile
---- audacious-1.2.2/audacious/Makefile 2006-10-30 23:03:15.000000000 +0100
-+++ audacious-1.2.2.new/audacious/Makefile     2006-11-19 12:58:09.000000000 +0100
-@@ -16,6 +16,7 @@
-       $(CHARDET_LIBS) \
-       $(GTK_LIBS)      \
+--- audacious-1.3.0/src/audacious/Makefile     2007-01-26 18:58:10.000000000 +0100
++++ audacious-1.3.0/src/audacious/Makefile     2007-01-26 18:59:45.000000000 +0100
+@@ -15,6 +15,7 @@
+       $(GTK_LIBS) \
        $(LIBGLADE_LIBS) \
+       $(REGEX_LIBS) \
 +      -lhome_etc \
        ./widgets/libwidgets.a
  
  CFLAGS += \
-diff -urN audacious-1.2.2/libaudacious/configdb.h audacious-1.2.2.new/libaudacious/configdb.h
---- audacious-1.2.2/libaudacious/configdb.h    2005-10-24 12:06:47.000000000 +0200
-+++ audacious-1.2.2.new/libaudacious/configdb.h        2006-11-19 12:54:41.000000000 +0100
-@@ -2,7 +2,7 @@
+--- audacious-1.3.0/src/libaudacious/configdb.h        2007-01-26 18:58:10.000000000 +0100
++++ audacious-1.3.0/src/libaudacious/configdb.h        2007-01-26 19:01:51.000000000 +0100
+@@ -2,6 +2,7 @@
  #define CONFIGDB_H
  
  #include <glib.h>
--
 +#include <home_etc.h>
  
- typedef struct _ConfigDb ConfigDb;
+ /**
+  * ConfigDb:
+--- audacious-1.3.0/src/libaudacious/Makefile  2007-01-23 19:22:32.000000000 +0100
++++ audacious-1.3.0/src/libaudacious/Makefile  2007-01-26 19:03:46.000000000 +0100
+@@ -9,7 +9,8 @@
+ LIBADD = \
+       $(GTK_LIBS) \
+       $(GCONF_LIBS) \
+-      $(LIBMCS_LIBS)
++      $(LIBMCS_LIBS) \
++      -lhome_etc
  
-diff -urN audacious-1.2.2/libaudacious/configdb_rcfile.c audacious-1.2.2.new/libaudacious/configdb_rcfile.c
---- audacious-1.2.2/libaudacious/configdb_rcfile.c     2006-08-03 01:00:13.000000000 +0200
-+++ audacious-1.2.2.new/libaudacious/configdb_rcfile.c 2006-11-19 12:54:18.000000000 +0100
-@@ -40,7 +40,7 @@
-     ConfigDb *db;
+ CFLAGS += $(PICFLAGS) \
+       $(GTK_CFLAGS) \
+--- audacious-1.3.0/src/audacious/main.c       2007-01-23 03:21:22.000000000 +0100
++++ audacious-1.3.0/src/audacious/main.c       2007-01-26 19:08:25.000000000 +0100
+@@ -490,13 +490,13 @@
+     char *xdg_cache_home;
  
-     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)
-diff -urN audacious-1.2.2/libaudacious/configdb_xmlfile.c audacious-1.2.2.new/libaudacious/configdb_xmlfile.c
---- audacious-1.2.2/libaudacious/configdb_xmlfile.c    2006-08-03 01:00:13.000000000 +0200
-+++ audacious-1.2.2.new/libaudacious/configdb_xmlfile.c        2006-11-19 12:54:58.000000000 +0100
-@@ -38,7 +38,7 @@
-     GError *err = NULL;
+     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")));
  
-     db = g_new(ConfigDb, 1);
--    db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH, 
-+    db->filename = g_build_filename(_HEdir, BMP_RCPATH, 
-                                     "preferences.xml", NULL);
-     bmp_xml_document_load(&db->file, db->filename, &err);
-     if (!db->file)
-diff -urN audacious-1.2.2/libaudacious/Makefile audacious-1.2.2.new/libaudacious/Makefile
---- audacious-1.2.2/libaudacious/Makefile      2006-11-06 09:15:43.000000000 +0100
-+++ audacious-1.2.2.new/libaudacious/Makefile  2006-11-19 12:55:57.000000000 +0100
-@@ -10,7 +10,8 @@
+     bmp_paths[BMP_PATH_USER_DIR] =
+--- audacious-1.3.0/src/audacious/util.c       2007-01-27 14:01:55.000000000 +0100
++++ audacious-1.3.0/src/audacious/util.c       2007-02-05 22:48:12.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include "util.h"
  
- LIBADD = \
-       $(GTK_LIBS)      \
--      $(GCONF_LIBS)
-+      $(GCONF_LIBS) \
-+      -lhome_etc
+ #include <glib.h>
++#include <home_etc.h>
+ #include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #include <gtk/gtk.h>
+@@ -1011,7 +1012,7 @@
+   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 );
  
- CFLAGS += $(PICFLAGS) \
-       $(GTK_CFLAGS)        \