mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Update to 4.8.3.

Browse Source
This commit is contained in:
Raphael Kubo da Costa 2014-12-26 20:05:09 +00:00
parent 0abb49dbcf
commit f7190ba3a7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375654
3 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/phonon/Makefile
View File

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= phonon
PORTVERSION= 4.8.1
PORTREVISION= 1
PORTVERSION= 4.8.3
CATEGORIES= multimedia kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org

4
multimedia/phonon/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (KDE/phonon-4.8.1.tar.xz) = b6ca0126cd5330731875acc1cc0b60f8c9ed7ebc71e1d0210b74bf21658027d1
SIZE (KDE/phonon-4.8.1.tar.xz) = 321652
SHA256 (KDE/phonon-4.8.3.tar.xz) = a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16
SIZE (KDE/phonon-4.8.3.tar.xz) = 322012

35
multimedia/phonon/files/patch-phonon__objectdescriptionmodel.h
View File

@ -1,35 +0,0 @@
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