Author: megabajt Date: Sun Nov 19 14:31:36 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.2.2
---- Files affected:
SOURCES:
audacious-home_etc.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/audacious-home_etc.patch
diff -u SOURCES/audacious-home_etc.patch:1.2
SOURCES/audacious-home_etc.patch:1.3
--- SOURCES/audacious-home_etc.patch:1.2 Fri Dec 16 12:38:02 2005
+++ SOURCES/audacious-home_etc.patch Sun Nov 19 15:31:31 2006
@@ -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 @@
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 @@
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 @@
"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) \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/audacious-home_etc.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
