Index: head/multimedia/phonon/Makefile
===================================================================
--- head/multimedia/phonon/Makefile	(revision 371208)
+++ head/multimedia/phonon/Makefile	(revision 371209)
@@ -1,46 +1,47 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	phonon
 PORTVERSION=	4.8.1
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multimedia framework
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist
 
 USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib dbus gui \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:xz
 CMAKE_ARGS=	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
 		-DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \
 		-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_ON=	-DWITH_PulseAudio:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PulseAudio:BOOL=OFF
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_INCDIR}
 	${MKDIR} ${STAGEDIR}${QT_LIBDIR}
 	${LN} -sf ${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/phonon
 	${LN} -sf ${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/Phonon
 	${LN} -sf ${PREFIX}/include/KDE/Phonon ${STAGEDIR}${PREFIX}/include/phonon/Phonon
 .for lib in phonon phononexperimental
 	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so
 	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so.4
 .endfor
 
 .include <bsd.port.mk>
Index: head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h
===================================================================
--- head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h	(nonexistent)
+++ head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h	(revision 371209)
@@ -0,0 +1,35 @@
+Submitted upstream in https://git.reviewboard.kde.org/r/120664/
+
+commit 5ec6c0202cf44ee9790baed617c1e2f195f288d3
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Mon Oct 20 00:13:11 2014 +0300
+
+    Revert "clang compat fix (from Qt)"
+    
+    The original Qt commit (3cba3745, "Phonon: Export ObjectDescriptionModel
+    to prevent link errors with Clang") was a workaround for
+    http://llvm.org/bugs/show_bug.cgi?id=8177, which was fixed more than 4
+    years ago.
+    
+    Now that we have proper support for clang in Phonon and build it with
+    -fvisibility=hidden, the workaround started causing problems, as
+    ObjectDescriptionModel::staticObject and others were not being exported
+    as expected. A quick test for this is building Qt's phonon capabilities
+    example.
+    
+    This reverts commit 845e395ab3aba10dbd57207ad71fbbd6b422f107.
+--- phonon/objectdescriptionmodel.h
++++ phonon/objectdescriptionmodel.h
+@@ -139,11 +139,10 @@ namespace Phonon
+ 
+ /* Required to ensure template class vtables are exported on both symbian
+ and existing builds. */
+-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT) || defined(Q_CC_CLANG)
++#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)
+ // RVCT compiler (2.2.686) requires the export declaration to be on the class to export vtables
+ // MWC compiler works both ways
+ // GCCE compiler is unknown (it can't compile QtCore yet)
+-// Clang also requires the export declaration to be on the class to export vtables
+ #define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT
+ #define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT
+ #else

Property changes on: head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property