From owner-svn-ports-head@FreeBSD.ORG Sun Oct 19 21:39:12 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C133131D; Sun, 19 Oct 2014 21:39:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2249AF8; Sun, 19 Oct 2014 21:39:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9JLdCBs077415; Sun, 19 Oct 2014 21:39:12 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9JLdCjX077413; Sun, 19 Oct 2014 21:39:12 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201410192139.s9JLdCjX077413@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 19 Oct 2014 21:39:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371209 - in head/multimedia/phonon: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Oct 2014 21:39:13 -0000 Author: rakuco Date: Sun Oct 19 21:39:11 2014 New Revision: 371209 URL: https://svnweb.freebsd.org/changeset/ports/371209 QAT: https://qat.redports.org/buildarchive/r371209/ Log: Add patch sent upstream to export the right symbols in ObjectDescriptionModel. We basically need to revert a workaround inherited from a Qt commit from 2010 for a clang bug that has been fixed for many years. This workaround coupled with proper support for -fvisibility=hidden I added to Phonon a while ago was causing build problems in misc/qt4-qtdemo. Added: head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h (contents, props changed) Modified: head/multimedia/phonon/Makefile Modified: head/multimedia/phonon/Makefile ============================================================================== --- head/multimedia/phonon/Makefile Sun Oct 19 21:32:13 2014 (r371208) +++ head/multimedia/phonon/Makefile Sun Oct 19 21:39:11 2014 (r371209) @@ -3,6 +3,7 @@ PORTNAME= phonon PORTVERSION= 4.8.1 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE Added: head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h Sun Oct 19 21:39:11 2014 (r371209) @@ -0,0 +1,35 @@ +Submitted upstream in https://git.reviewboard.kde.org/r/120664/ + +commit 5ec6c0202cf44ee9790baed617c1e2f195f288d3 +Author: Raphael Kubo da Costa +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