Skip to content
This repository has been archived by the owner on Jan 16, 2025. It is now read-only.

Commit

Permalink
qt5 5.3.2
Browse files Browse the repository at this point in the history
Version bump for Qt5. I’m currently compiling on Yosemite to see if the
patch in #32093 is necessary still or whether that has been merged into
this release. Whether we want to wait for the Yosemite build to
complete and then patch if necessary, or address that afterwards is up
to the maintainers.

Closes #32093.
  • Loading branch information
Dominyk Tiller authored and MikeMcQuaid committed Sep 16, 2014
1 parent 98d10af commit 1a8b4da
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions Library/Formula/qt5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,20 @@ def stage

class Qt5 < Formula
homepage "http://qt-project.org/"
url "http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.tar.gz"
sha1 "3244dd34f5fb695e903eaa49c6bd0838b9bf7a73"
url "http://qtmirror.ics.com/pub/qtproject/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.gz"
mirror "http://download.qt-project.org/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.gz"
sha1 "502dd2db1e9ce349bb8ac48b4edf7f768df1cafe"

bottle do
sha1 "18c4f7758a47894591905831b6e740315ff1ce36" => :mavericks
sha1 "104b6d656020e9a615084732f2ecbfec8bb74f28" => :mountain_lion
sha1 "fc5fee03fa0ad09c5c96b869022590cdc7b3b1fd" => :lion
end

# Patch to fix compile errors on Yosemite. Can be removed with 5.4.
# https://bugreports.qt-project.org/browse/QTBUG-41136
patch :DATA

head "git://gitorious.org/qt/qt5.git", :branch => "stable",
:using => Qt5HeadDownloadStrategy, :shallow => false

Expand Down Expand Up @@ -108,3 +113,18 @@ def caveats; <<-EOS.undent
EOS
end
end

__END__
diff --git a/qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
index a73974c..d3f3eae 100644
--- a/qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
+++ b/qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
@@ -322,7 +322,7 @@ static void *AVFMediaPlayerSessionObserverCurrentItemObservationContext = &AVFMe
//AVPlayerItem "status" property value observer.
if (context == AVFMediaPlayerSessionObserverStatusObservationContext)
{
- AVPlayerStatus status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
+ AVPlayerStatus status = (AVPlayerStatus)[[change objectForKey:NSKeyValueChangeNewKey] integerValue];
switch (status)
{
//Indicates that the status of the player is not yet known because

0 comments on commit 1a8b4da

Please sign in to comment.