banshee-dbus.patch

   1 diff -urN aaa/banshee-0.11.0/configure.ac banshee-0.11.0/configure.ac
   2 --- aaa/banshee-0.11.0/configure.ac     2006-09-19 04:13:39.000000000 +0200
   3 +++ banshee-0.11.0/configure.ac 2006-09-21 22:26:47.124143624 +0200
   4 @@ -285,8 +286,12 @@
   5  AC_SUBST(HAL_LIBS)
   6
   7  dnl DBus devel detect .so version for dll maps
   8 -PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.60, dbus60=yes, dbus60=no)
   9 -if test "x$dbus60" = "xyes"; then
  10 +PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.90, dbus90=yes, dbus90=no)
  11 +AC_MSG_RESULT([$dbus90])
  12 +PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.60, dbus60=yes, dbus60=no)
  13 +if test "x$dbus90" = "xyes"; then
  14 +       DBUS_SOVERSION=3
  15 +elif test "x$dbus60" = "xyes"; then
  16         DBUS_SOVERSION=2
  17  else
  18         DBUS_SOVERSION=1
  19 @@ -294,6 +299,20 @@
  20  AC_SUBST(DBUS_SOVERSION)
  21
  22
  23 +dnl DBus-Glib devel detect .so version for dll maps
  24 +PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.90, dbusg90=yes, dbusg90=no)
  25 +AC_MSG_RESULT([$dbusg90])
  26 +PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.60, dbusg60=yes, dbusg60=no)
  27 +if test "x$dbusg90" = "xyes"; then
  28 +       DBUS_GLIB_SOVERSION=3
  29 +elif test "x$dbusg60" = "xyes"; then
  30 +       DBUS_GLIB_SOVERSION=2
  31 +else
  32 +       DBUS_GLIB_SOVERSION=1
  33 +fi
  34 +AC_SUBST(DBUS_GLIB_SOVERSION)
  35 +
  36 +
  37  dnl libnautilus-burn devel deps
  38  PKG_CHECK_MODULES(LIBNAUTILUS_BURN, libnautilus-burn >= 2.15, lnb15=yes, lnb15=no)
  39  PKG_CHECK_MODULES(LIBNAUTILUS_BURN, libnautilus-burn >= 2.13, lnb13=yes, lnb13=no)
  40 diff -urN aaa/banshee-0.11.0/hal-sharp/hal-sharp.dll.config.in banshee-0.11.0/hal-sharp/hal-sharp.dll.config.in
  41 --- aaa/banshee-0.11.0/hal-sharp/hal-sharp.dll.config.in        2006-07-15 17:49:38.000000000 +0200
  42 +++ banshee-0.11.0/hal-sharp/hal-sharp.dll.config.in    2006-09-21 22:24:41.792196976 +0200
  43 @@ -1,6 +1,6 @@
  44  <configuration>
  45    <dllmap dll="libdbus-1" target="libdbus-1.so.@DBUS_SOVERSION@" />
  46 -  <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.@DBUS_SOVERSION@" />
  47 +  <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.@DBUS_GLIB_SOVERSION@" />
  48    <dllmap dll="libglib-2.0.so" target="libglib-2.0.so.0" />
  49    <dllmap dll="libhal" target="libhal.so.1" />
  50  </configuration>
  51 diff -urN aaa/banshee-0.11.0/src/banshee.exe.config.in banshee-0.11.0/src/banshee.exe.config.in
  52 --- aaa/banshee-0.11.0/src/banshee.exe.config.in        2006-07-15 17:49:30.000000000 +0200
  53 +++ banshee-0.11.0/src/banshee.exe.config.in    2006-09-21 22:23:33.699548632 +0200
  54 @@ -6,4 +6,6 @@
  55         <dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0" />
  56         <dllmap dll="libbanshee" target="@expanded_libdir@/@PACKAGE@/libbanshee.so" />
  57         <dllmap dll="libX11" target="libX11.so.6" />
  58 +       <dllmap dll="libdbus-1" target="libdbus-1.so.@DBUS_SOVERSION@" />
  59 +       <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.@DBUS_GLIB_SOVERSION@" />
  60  </configuration>