I hereby claim:
- I am lfranchi on github.
- I am lfranchi (https://keybase.io/lfranchi) on keybase.
- I have a public key whose fingerprint is 50A4 0BE7 695D 0AA8 CBB8 445B 599B 8608 67DA 0A44
To claim this, I am signing this object:
I hereby claim:
To claim this, I am signing this object:
diff --git a/vlc.rb b/vlc.rb | |
index d577870..f66ff65 100644 | |
--- a/vlc.rb | |
+++ b/vlc.rb | |
@@ -31,7 +31,7 @@ class Vlc < Formula | |
# gettext is keg-only so make sure vlc finds it | |
gettext = Formula.factory("gettext") | |
- ldf = "LDFLAGS=\"-L#{gettext.lib} -lintl\"" | |
+ ldf = "LDFLAGS=\"-L#{gettext.lib} -lintl -lstdc++\"" |
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/ |
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/ |
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/ |
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/ |
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> |
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; /* |
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) |
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 |