lfranchi

diff -Nurd README.launchd dbus-1.2.12-new/README.launchd
--- README.launchd	1969-12-31 19:00:00.000000000 -0500
+++ dbus-1.2.12-new/README.launchd	2009-02-23 08:33:30.000000000 -0500
@@ -0,0 +1,61 @@
+Launchd[1,2] replaces init, inetd and cron on Mac OS X since 10.4 "Tiger".
+dbus uses this service to provide a common session bus address for each user
+and so deprecates the X11 enabled dbus-launcher.
+
+[1] http://developer.apple.com/MacOsX/launchd.html
+[2] http://launchd.macosforge.org/

lfranchi

diff -Nurd README.launchd dbus-1.2.12-new/README.launchd
--- README.launchd	1969-12-31 19:00:00.000000000 -0500
+++ dbus-1.2.12-new/README.launchd	2009-02-23 08:33:30.000000000 -0500
@@ -0,0 +1,61 @@
+Launchd[1,2] replaces init, inetd and cron on Mac OS X since 10.4 "Tiger".
+dbus uses this service to provide a common session bus address for each user
+and so deprecates the X11 enabled dbus-launcher.
+
+[1] http://developer.apple.com/MacOsX/launchd.html
+[2] http://launchd.macosforge.org/

lfranchi

diff -Nurd README.launchd dbus-1.2.12-new/README.launchd
--- README.launchd	1969-12-31 19:00:00.000000000 -0500
+++ dbus-1.2.12-new/README.launchd	2009-02-23 08:33:30.000000000 -0500
@@ -0,0 +1,61 @@
+Launchd[1,2] replaces init, inetd and cron on Mac OS X since 10.4 "Tiger".
+dbus uses this service to provide a common session bus address for each user
+and so deprecates the X11 enabled dbus-launcher.
+
+[1] http://developer.apple.com/MacOsX/launchd.html
+[2] http://launchd.macosforge.org/

lfranchi

diff -Nurd dbus-1.2.16/README.launchd dbus-1.2.16-new/README.launchd
--- dbus-1.2.16/README.launchd	1969-12-31 19:00:00.000000000 -0500
+++ dbus-1.2.16-new/README.launchd	2009-09-05 08:56:49.000000000 -0400
@@ -0,0 +1,61 @@
+Launchd[1,2] replaces init, inetd and cron on Mac OS X since 10.4 "Tiger".
+dbus uses this service to provide a common session bus address for each user
+and so deprecates the X11 enabled dbus-launcher.
+
+[1] http://developer.apple.com/MacOsX/launchd.html
+[2] http://launchd.macosforge.org/

lfranchi

diff --git a/resources.qrc b/resources.qrc
index 9996e5c..7442790 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -88,5 +88,6 @@
 <file>./data/www/auth.html</file>
 <file>./data/www/auth.na.html</file>
 <file>./data/www/tomahawk_banner_small.png</file>
+<file>./data/sql/dbmigrate-22_to_23.sql</file>
 </qresource>

lfranchi

diff --git a/vlc/backend.cpp b/vlc/backend.cpp
index 1120fc3..a31a748 100644
--- a/vlc/backend.cpp
+++ b/vlc/backend.cpp
@@ -298,13 +298,13 @@ QList<int> Backend::objectDescriptionIndexes(ObjectDescriptionType type) const
     case Phonon::SubtitleType: {
         list << GlobalSubtitles::instance()->globalIndexes();
     }
-    break;
+    break; /*

lfranchi

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1fbbb5..c85e07f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ set(PHONON_GST_PATCH_VERSION "1")
 set(PHONON_GST_VERSION "${PHONON_GST_MAJOR_VERSION}.${PHONON_GST_MINOR_VERSION}.${PHONON_GST_PATCH_VERSION}")
 add_definitions(-DPHONON_GST_VERSION="${PHONON_GST_VERSION}")
 
-if (Q_WS_X11)
+#if (Q_WS_X11)

lfranchi

require 'formula'

class VlcGit < Formula
  head 'git://git.videolan.org/vlc/vlc-1.1.git'
  homepage 'http://www.videolan.org/vlc'

  depends_on 'pcre'
  depends_on 'gettext'

  def install

lfranchi

diff --git a/src/libvlc.cpp b/src/libvlc.cpp
index a9aa3a1..1a13866 100644
--- a/src/libvlc.cpp
+++ b/src/libvlc.cpp
@@ -99,7 +99,7 @@ bool LibVLC::init()
         // Do not preload services discovery modules, we don't use them.
         args << "--services-discovery=''";
         // Allow multiple starts (one gets to wonder whether that makes a difference.
-        args << "--no-one-instance";
+        //args << "--no-one-instance";

lfranchi

diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
index 44f07db..248760b 100644
--- a/src/utils/libvlc.cpp
+++ b/src/utils/libvlc.cpp
@@ -98,6 +98,7 @@ bool LibVLC::init()
         args << "--no-xlib";
         // Do not preload services discovery modules, we don't use them.
         args << "--services-discovery=''";
+#ifndef Q_OS_MAC
         // Allow multiple starts (one gets to wonder whether that makes a difference.