contribs: update qt4 for Mac

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index eec2ff168a1dcabb1703e937d691162eb76e9ca6..d03827636d9b18e3352388b630752a11f16d3b9c 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1607,7 +1607,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
-       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework && make && make install)
+       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework -arch $(ARCH) && make && make install)
        touch $@
 
 CLEAN_FILE += .qt4_mac

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 377bc4dee519af081a1641cb259900ecd6877b4a..4efc814283c113473e0b88d916f94874354041b3 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -177,8 +177,8 @@ MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 #MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 QT4_VERSION=4.4.3
 QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
-QT4_MAC_VERSION=4.4.0
-QT4_MAC_URL=ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
+QT4_MAC_VERSION=4.5.2
+QT4_MAC_URL=http://get.qtsoftware.com/qt/source/qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
 QT4T_VERSION=4.3.2
 QT4T_URL=ftp://ftp.trolltech.com/pub/qt/source/qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 ZLIB_VERSION=1.2.3