From 2808cbe8c6655bd45ec864786fc7ac48837da3b8 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Sun, 19 Nov 2006 14:31:31 +0000 Subject: [PATCH] - updated for 1.2.2 Changed files: audacious-desktop.patch -> 1.4 audacious-home_etc.patch -> 1.3 --- audacious-desktop.patch | 8 ++--- audacious-home_etc.patch | 74 +++++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/audacious-desktop.patch b/audacious-desktop.patch index 30c4856..444e411 100644 --- a/audacious-desktop.patch +++ b/audacious-desktop.patch @@ -1,6 +1,6 @@ -diff -aurN audacious-0.2.orig/audacious/audacious.desktop.in audacious-0.2/audacious/audacious.desktop.in ---- audacious-0.2.orig/audacious/audacious.desktop.in 2006-01-03 22:05:01.000000000 +0100 -+++ audacious-0.2/audacious/audacious.desktop.in 2006-02-09 17:07:53.848956736 +0100 +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 @@ -2,10 +2,11 @@ Name=Audacious Comment=Play music @@ -9,7 +9,7 @@ diff -aurN audacious-0.2.orig/audacious/audacious.desktop.in audacious-0.2/audac Exec=audacious -Icon=audacious.png +Icon=audacious - MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg; + 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; +Categories=GTK;Audio;Player; Terminal=false diff --git a/audacious-home_etc.patch b/audacious-home_etc.patch index ac2d0b1..81e5c2b 100644 --- a/audacious-home_etc.patch +++ b/audacious-home_etc.patch @@ -1,15 +1,7 @@ -diff -aurN audacious-0.1.2.orig/audacious/main.c audacious-0.1.2/audacious/main.c ---- audacious-0.1.2.orig/audacious/main.c 2005-12-04 18:29:14.000000000 +0100 -+++ audacious-0.1.2/audacious/main.c 2005-12-16 12:31:16.000000000 +0100 -@@ -77,7 +77,6 @@ - #include "pixmaps.h" - #include "images/audacious_player.xpm" - -- - /* Translatable string for beep.desktop's comment field */ - const gchar *desktop_comment = N_("Audacious"); - -@@ -408,7 +407,7 @@ +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) { @@ -18,22 +10,20 @@ diff -aurN audacious-0.1.2.orig/audacious/main.c audacious-0.1.2/audacious/main. 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 -aurN audacious-0.1.2.orig/audacious/Makefile.am audacious-0.1.2/audacious/Makefile.am ---- audacious-0.1.2.orig/audacious/Makefile.am 2005-11-16 05:21:50.000000000 +0100 -+++ audacious-0.1.2/audacious/Makefile.am 2005-12-16 12:30:08.000000000 +0100 -@@ -10,7 +10,8 @@ +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) \ $(LIBGLADE_LIBS) \ - $(LTLIBINTL) \ -- $(top_builddir)/libaudacious/libaudacious.la -+ $(top_builddir)/libaudacious/libaudacious.la \ -+ -lhome_etc ++ -lhome_etc \ + ./widgets/libwidgets.a - audacious_CFLAGS = \ - $(X_CFLAGS) \ -diff -aurN audacious-0.1.2.orig/libaudacious/configdb.h audacious-0.1.2/libaudacious/configdb.h ---- audacious-0.1.2.orig/libaudacious/configdb.h 2005-10-24 12:06:47.000000000 +0200 -+++ audacious-0.1.2/libaudacious/configdb.h 2005-12-16 12:30:48.000000000 +0100 + 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 @@ #define CONFIGDB_H @@ -43,9 +33,9 @@ diff -aurN audacious-0.1.2.orig/libaudacious/configdb.h audacious-0.1.2/libaudac typedef struct _ConfigDb ConfigDb; -diff -aurN audacious-0.1.2.orig/libaudacious/configdb_rcfile.c audacious-0.1.2/libaudacious/configdb_rcfile.c ---- audacious-0.1.2.orig/libaudacious/configdb_rcfile.c 2005-10-24 12:06:47.000000000 +0200 -+++ audacious-0.1.2/libaudacious/configdb_rcfile.c 2005-12-16 12:30:08.000000000 +0100 +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; @@ -55,16 +45,28 @@ diff -aurN audacious-0.1.2.orig/libaudacious/configdb_rcfile.c audacious-0.1.2/l "config", NULL); db->file = bmp_rcfile_open(db->filename); if (!db->file) -diff -aurN audacious-0.1.2.orig/libaudacious/Makefile.am audacious-0.1.2/libaudacious/Makefile.am ---- audacious-0.1.2.orig/libaudacious/Makefile.am 2005-10-24 12:06:47.000000000 +0200 -+++ audacious-0.1.2/libaudacious/Makefile.am 2005-12-16 12:30:08.000000000 +0100 +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; + + 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 @@ - libaudacious_la_LIBADD = \ + + LIBADD = \ $(GTK_LIBS) \ - $(GCONF_LIBS) \ -- $(GNOMEVFS_LIBS) -+ $(GNOMEVFS_LIBS) \ +- $(GCONF_LIBS) ++ $(GCONF_LIBS) \ + -lhome_etc - INCLUDES = \ + CFLAGS += $(PICFLAGS) \ $(GTK_CFLAGS) \ -- 2.44.0