- adjusted to 0.9.7.1

Changed files:
    bmp-desktop.patch -> 1.6
    bmp-home_etc.patch -> 1.2
    bmp-xmms-skins-dir.patch -> 1.4

diff --git a/bmp-desktop.patch b/bmp-desktop.patch
index c9f83e40a093be52fee1e0b5ea011d5fccc42ca4..88b7e40e82a285a2aa5817b0992b9cc102ccc2ef 100644 (file)
--- a/bmp-desktop.patch
+++ b/bmp-desktop.patch
@@ -7,9 +7,9 @@ diff -aurN bmp-0.9.7rc2.orig/beep/bmp.desktop.in bmp-0.9.7rc2/beep/bmp.desktop.i
  Comment=Play music
 +Comment[pl]=Odtwarzacz muzyki
  Exec=beep-media-player
--Icon=bmp.svg
+-Icon=bmp.png
 +Icon=bmp
- 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=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
 -Categories=Application;GTK;AudioVideo;Player;
 +Categories=GTK;Audio;Player;
  Terminal=false

diff --git a/bmp-home_etc.patch b/bmp-home_etc.patch
index 0333c4c5f2dc3cb05bb51f39d51b0eb160575fd4..369656f46cc26015ac470d4ab870c2a3f9a4dbc0 100644 (file)
--- a/bmp-home_etc.patch
+++ b/bmp-home_etc.patch
@@ -1,67 +1,54 @@
-diff -Nur bmp-0.9.7.orig/beep/Makefile.am bmp-0.9.7/beep/Makefile.am
---- bmp-0.9.7.orig/beep/Makefile.am    2004-07-06 05:10:47.000000000 +0000
-+++ bmp-0.9.7/beep/Makefile.am 2004-07-16 10:16:42.000000000 +0000
-@@ -12,7 +12,8 @@
-       $(top_builddir)/libbeep/libbeep.la \
-       @LTLIBINTL@ \
-       @GNOMEVFS_LIBS@ \
--      @GCONF_LIBS@
-+      @GCONF_LIBS@ \
+--- bmp-0.9.7.1/beep/Makefile.am.orig  2005-08-09 02:41:52.000000000 +0200
++++ bmp-0.9.7.1/beep/Makefile.am       2005-11-01 10:33:17.554845704 +0100
+@@ -11,7 +11,8 @@
+       $(GTK_LIBS)      \
+       $(LIBGLADE_LIBS) \
+       $(LTLIBINTL)     \
+-      $(top_builddir)/libbeep/libbeep.la
++      $(top_builddir)/libbeep/libbeep.la \
 +      -lhome_etc
  
  beep_CFLAGS = \
-       @X_CFLAGS@ \
-diff -Nur bmp-0.9.7.orig/beep/main.c bmp-0.9.7/beep/main.c
---- bmp-0.9.7.orig/beep/main.c 2004-07-08 02:57:36.000000000 +0000
-+++ bmp-0.9.7/beep/main.c      2004-07-16 10:16:42.000000000 +0000
+       $(X_CFLAGS)        \
+--- bmp-0.9.7.1/beep/main.c.orig       2005-08-27 13:20:04.000000000 +0200
++++ bmp-0.9.7.1/beep/main.c    2005-11-01 10:38:05.469076088 +0100
 @@ -72,6 +72,7 @@
  #include "pixmaps.h"
- #include "beep_mini.xpm"
+ #include "images/bmp_player.xpm"
  
 +#include <home_etc.h>
  
  /* Translatable string for beep.desktop's comment field */
  const gchar *desktop_comment = N_("Beep Media Player");
-@@ -375,7 +376,7 @@
+@@ -402,7 +403,7 @@
  static void
  bmp_init_paths(void)
  {
--    bmp_user_dir = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL);
-+    bmp_user_dir = g_build_filename(_HEdir, BMP_RCPATH, NULL);
- 
-     bmp_user_plugin_dir =
-         g_build_filename(bmp_user_dir, BMP_USER_PLUGIN_DIR_BASENAME, NULL);
-diff -Nur bmp-0.9.7.orig/libbeep/Makefile.am bmp-0.9.7/libbeep/Makefile.am
---- bmp-0.9.7.orig/libbeep/Makefile.am 2004-06-24 16:36:50.000000000 +0000
-+++ bmp-0.9.7/libbeep/Makefile.am      2004-07-16 10:16:42.000000000 +0000
-@@ -6,7 +6,7 @@
- lib_LTLIBRARIES = libbeep.la
- 
- libbeep_la_LDFLAGS = -export-dynamic -version-info $(LIBBEEP_MAJOR_VERSION):$(LIBBEEP_MINOR_VERSION):$(LIBBEEP_MICRO_VERSION)
--libbeep_la_LIBADD = @GTK_LIBS@
-+libbeep_la_LIBADD = @GTK_LIBS@ -lhome_etc
- INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ @GNOMEVFS_CFLAGS@ -I$(top_srcdir)/../intl -I$(top_srcdir)/..
- 
- if HAVE_GCONF
-diff -Nur bmp-0.9.7.orig/libbeep/configdb_rcfile.c bmp-0.9.7/libbeep/configdb_rcfile.c
---- bmp-0.9.7.orig/libbeep/configdb_rcfile.c   2004-07-08 02:57:38.000000000 +0000
-+++ bmp-0.9.7/libbeep/configdb_rcfile.c        2004-07-16 10:18:06.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include "rcfile.h"
- 
-+#include <home_etc.h>
- 
- #define RCFILE_DEFAULT_SECTION_NAME "beep"
+-    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/libbeep/Makefile.am.orig       2005-08-09 02:41:53.000000000 +0200
++++ bmp-0.9.7.1/libbeep/Makefile.am    2005-11-01 10:41:02.170213432 +0100
+@@ -10,7 +10,8 @@
+ libbeep_la_LIBADD = \
+       $(GTK_LIBS)      \
+       $(GCONF_LIBS)    \
+-      $(GNOMEVFS_LIBS)
++      $(GNOMEVFS_LIBS) \
++      -lhome_etc
  
-@@ -40,8 +41,8 @@
+ INCLUDES = \
+       $(GTK_CFLAGS)        \
+--- bmp-0.9.7.1/libbeep/configdb_rcfile.c~     2005-11-01 10:30:32.056005352 +0100
++++ bmp-0.9.7.1/libbeep/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, 
--                                    "config", NULL);
-+    db->filename = g_build_filename( _HEdir, BMP_RCPATH, 
-+                                    "config", NULL);
++    db->filename = g_build_filename(_HEdir, BMP_RCPATH, 
+                                     "config", NULL);
      db->file = bmp_rcfile_open(db->filename);
      if (!db->file)
-         db->file = bmp_rcfile_new();

diff --git a/bmp-xmms-skins-dir.patch b/bmp-xmms-skins-dir.patch
index 26ea9e6ececd339c089d6b19c7a5046e762fa5b3..c146affa99d666c7bade213dcd7cfb4a8073ab88 100644 (file)
--- a/bmp-xmms-skins-dir.patch
+++ b/bmp-xmms-skins-dir.patch
@@ -1,6 +1,6 @@
---- bmp-0.9.7rc2/beep/skinwin.c        2004-07-12 10:32:23.000000000 +0200
-+++ bmp-0.9.7rc2/beep/skinwin.c.troll  2004-08-25 11:43:25.692762576 +0200
-@@ -227,12 +227,18 @@
+--- bmp-0.9.7.1/beep/skinwin.c.orig    2005-03-23 05:55:12.000000000 +0100
++++ bmp-0.9.7.1/beep/skinwin.c 2005-11-01 10:24:16.226140176 +0100
+@@ -231,12 +231,18 @@
  void
  skinlist_update(void)
  {
@@ -9,7 +9,7 @@
  
      skinlist_clear();
  
-     scan_skindir(bmp_user_skin_dir);
+     scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
      scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
 +    str = g_strconcat(g_get_home_dir(), "/.xmms/Skins", NULL);
 +    scan_skindir(str);