]> git.pld-linux.org Git - packages/audacious.git/blob - audacious-home_etc.patch
- rediffed, move #include <home_etc.h> to configdb.h
[packages/audacious.git] / audacious-home_etc.patch
1 diff -aurN audacious-0.1.2.orig/audacious/main.c audacious-0.1.2/audacious/main.c
2 --- audacious-0.1.2.orig/audacious/main.c       2005-12-04 18:29:14.000000000 +0100
3 +++ audacious-0.1.2/audacious/main.c    2005-12-16 12:31:16.000000000 +0100
4 @@ -77,7 +77,6 @@
5  #include "pixmaps.h"
6  #include "images/audacious_player.xpm"
7  
8 -
9  /* Translatable string for beep.desktop's comment field */
10  const gchar *desktop_comment = N_("Audacious");
11  
12 @@ -408,7 +407,7 @@
13  static void
14  bmp_init_paths(void)
15  {
16 -    bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL);
17 +    bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(_HEdir, BMP_RCPATH, NULL);
18  
19      bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = USER_PATH(BMP_USER_PLUGIN_DIR_BASENAME);
20      bmp_paths[BMP_PATH_USER_SKIN_DIR] = USER_PATH(BMP_SKIN_DIR_BASENAME);
21 diff -aurN audacious-0.1.2.orig/audacious/Makefile.am audacious-0.1.2/audacious/Makefile.am
22 --- audacious-0.1.2.orig/audacious/Makefile.am  2005-11-16 05:21:50.000000000 +0100
23 +++ audacious-0.1.2/audacious/Makefile.am       2005-12-16 12:30:08.000000000 +0100
24 @@ -10,7 +10,8 @@
25         $(GTK_LIBS)      \
26         $(LIBGLADE_LIBS) \
27         $(LTLIBINTL)     \
28 -       $(top_builddir)/libaudacious/libaudacious.la
29 +       $(top_builddir)/libaudacious/libaudacious.la \
30 +       -lhome_etc
31  
32  audacious_CFLAGS = \
33         $(X_CFLAGS)        \
34 diff -aurN audacious-0.1.2.orig/libaudacious/configdb.h audacious-0.1.2/libaudacious/configdb.h
35 --- audacious-0.1.2.orig/libaudacious/configdb.h        2005-10-24 12:06:47.000000000 +0200
36 +++ audacious-0.1.2/libaudacious/configdb.h     2005-12-16 12:30:48.000000000 +0100
37 @@ -2,7 +2,7 @@
38  #define CONFIGDB_H
39  
40  #include <glib.h>
41 -
42 +#include <home_etc.h>
43  
44  typedef struct _ConfigDb ConfigDb;
45  
46 diff -aurN audacious-0.1.2.orig/libaudacious/configdb_rcfile.c audacious-0.1.2/libaudacious/configdb_rcfile.c
47 --- audacious-0.1.2.orig/libaudacious/configdb_rcfile.c 2005-10-24 12:06:47.000000000 +0200
48 +++ audacious-0.1.2/libaudacious/configdb_rcfile.c      2005-12-16 12:30:08.000000000 +0100
49 @@ -40,7 +40,7 @@
50      ConfigDb *db;
51  
52      db = g_new(ConfigDb, 1);
53 -    db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH, 
54 +    db->filename = g_build_filename(_HEdir, BMP_RCPATH, 
55                                      "config", NULL);
56      db->file = bmp_rcfile_open(db->filename);
57      if (!db->file)
58 diff -aurN audacious-0.1.2.orig/libaudacious/Makefile.am audacious-0.1.2/libaudacious/Makefile.am
59 --- audacious-0.1.2.orig/libaudacious/Makefile.am       2005-10-24 12:06:47.000000000 +0200
60 +++ audacious-0.1.2/libaudacious/Makefile.am    2005-12-16 12:30:08.000000000 +0100
61 @@ -10,7 +10,8 @@
62  libaudacious_la_LIBADD = \
63         $(GTK_LIBS)      \
64         $(GCONF_LIBS)    \
65 -       $(GNOMEVFS_LIBS)
66 +       $(GNOMEVFS_LIBS) \
67 +       -lhome_etc
68  
69  INCLUDES = \
70         $(GTK_CFLAGS)        \
This page took 0.037119 seconds and 4 git commands to generate.