aboutsummaryrefslogtreecommitdiff
path: root/multimedia/phonon
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-02-12 17:43:00 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-02-12 17:43:00 +0000
commit031fc9bfb6a4547020ec03524ede44c8ba3e359a (patch)
tree1dfb95498040d1c8d079ee7f59f242c1a89292b3 /multimedia/phonon
parent886e72e106f245bf02174c7401458aa999f33fbd (diff)
downloadports-031fc9bfb6a4547020ec03524ede44c8ba3e359a.tar.gz
ports-031fc9bfb6a4547020ec03524ede44c8ba3e359a.zip
Update Qt5 to 5.12.1
Release announcement: https://blog.qt.io/blog/2019/02/01/qt-5-12-1-released/ Changelog: https://wiki.qt.io/Qt_5.12.1_Change_Files - A change was required to qt-dist.mk to always pass LOCALBASE to qmake, as Qt5 has been installed to a prefix for some time now, there should not be any harm in that, with respect to it picking up installed versions of itself during build. PR: 235622 Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=492793
Diffstat (limited to 'multimedia/phonon')
-rw-r--r--multimedia/phonon/Makefile2
-rw-r--r--multimedia/phonon/files/patch-git_qt5-5.12.134
2 files changed, 35 insertions, 1 deletions
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 09fc9ef8d502..fedc11b1a353 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -3,7 +3,7 @@
PORTNAME= phonon
DISTVERSION= 4.10.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/phonon
diff --git a/multimedia/phonon/files/patch-git_qt5-5.12.1 b/multimedia/phonon/files/patch-git_qt5-5.12.1
new file mode 100644
index 000000000000..b925a2a66049
--- /dev/null
+++ b/multimedia/phonon/files/patch-git_qt5-5.12.1
@@ -0,0 +1,34 @@
+From f49c9a9921d5678628df394ebafa4e9b62b2af0e Mon Sep 17 00:00:00 2001
+From: "Tobias C. Berner" <tcberner@FreeBSD.org>
+Date: Mon, 11 Feb 2019 07:14:23 +0100
+Subject: [PATCH] Define QT.phonon4qt5.module = phonon4qt5 for Qt5-5.12.1
+
+Summary:
+I think [1] broke the qt5_phonon.pri file [2] -- the library is no
+longer added to the linker arguments.
+
+[1] https://github.com/qt/qtbase/commit/e0926ca4260953a70cdb2a6f84da35517ead1349#diff-4b36b0980a641d6a8d8e640f89c45625
+[2] http://package22.nyi.freebsd.org/data/112amd64-default-PR235620PR235622/2019-02-09_20h17m10s/logs/auralquiz-1.0.0_2.log
+
+Reviewers: #freebsd, sitter, O4 phonon
+
+Differential Revision: https://phabricator.kde.org/D18919
+---
+ qt5_phonon.pri | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git qt5_phonon.pri qt5_phonon.pri
+index 5dfeac8f..54216690 100644
+--- qt5_phonon.pri
++++ qt5_phonon.pri
+@@ -5,6 +5,7 @@ QT.@PHONON_LIB_SONAME@.PATCH_VERSION = @PHONON_LIB_PATCH_VERSION@
+ QT.@PHONON_LIB_SONAME@.name = @PHONON_LIB_SONAME@
+ QT.@PHONON_LIB_SONAME@.bins =
+ QT.@PHONON_LIB_SONAME@.includes = @ABS_INCLUDE_INSTALL_DIR@
++QT.@PHONON_LIB_SONAME@.module = @PHONON_LIB_SONAME@
+ QT.@PHONON_LIB_SONAME@.private_includes =
+ QT.@PHONON_LIB_SONAME@.sources =
+ QT.@PHONON_LIB_SONAME@.libs = @ABS_LIB_INSTALL_DIR@
+--
+2.20.1
+