svn commit: r440941 - in head: audio/musescore devel/qt5 devel/qtcreator graphics/luminance-qt5 polish/kadu x11-toolkits/qt5-declarative
Tobias C. Berner
tcberner at FreeBSD.org
Mon May 15 15:52:24 UTC 2017
Author: tcberner
Date: Mon May 15 15:52:22 2017
New Revision: 440941
URL: https://svnweb.freebsd.org/changeset/ports/440941
Log:
Prepare the removal of x11-toolkits/qt5-declarative
devel/qt5-declarative has not been released since Qt 5.5.1, and it
starts to lead to runtime conflicts with qt5-quick if installed.
* No port is actually still using it (there are ports that had it as a
dependency, but do not really require it -- bump these, and remove it).
* Remove it from the Qt 5 metaport.
Reported by: Armin Pirkovitsch
Reviewed by: rakuco
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D10673
Modified:
head/audio/musescore/Makefile
head/devel/qt5/Makefile
head/devel/qtcreator/Makefile
head/graphics/luminance-qt5/Makefile
head/polish/kadu/Makefile
head/x11-toolkits/qt5-declarative/Makefile
Modified: head/audio/musescore/Makefile
==============================================================================
--- head/audio/musescore/Makefile Mon May 15 15:46:02 2017 (r440940)
+++ head/audio/musescore/Makefile Mon May 15 15:52:22 2017 (r440941)
@@ -3,7 +3,7 @@
PORTNAME= musescore
PORTVERSION= 2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/
DISTNAME= MuseScore-${PORTVERSION}
@@ -20,7 +20,7 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
pkgconfig shared-mime-info zip
-USE_QT5= concurrent declarative designer help network scripttools svg \
+USE_QT5= concurrent designer help network scripttools svg \
webkit xml xmlpatterns \
buildtools_build linguisttools_build qmake_build uitools_build
ALL_TARGET= lrelease manpages all
Modified: head/devel/qt5/Makefile
==============================================================================
--- head/devel/qt5/Makefile Mon May 15 15:46:02 2017 (r440940)
+++ head/devel/qt5/Makefile Mon May 15 15:52:22 2017 (r440941)
@@ -2,12 +2,13 @@
PORTNAME= qt5
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= kde at FreeBSD.org
COMMENT= Cross-platform application and UI framework (metaport)
-USE_QT5= ${_USE_QT_ALL:Nphonon4:S/$/_run/} # phonon4 is not part of Qt itself.
+USE_QT5= ${_USE_QT_ALL:Nphonon4:Ndeclarative:S/$/_run/} # phonon4 is not part of Qt itself.
USES= metaport
.include <bsd.port.mk>
Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile Mon May 15 15:46:02 2017 (r440940)
+++ head/devel/qtcreator/Makefile Mon May 15 15:52:22 2017 (r440941)
@@ -3,6 +3,7 @@
PORTNAME= qtcreator
DISTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
@@ -17,7 +18,7 @@ LIB_DEPENDS= libqbscore.so:devel/qbs
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
USES= qmake compiler:c++11-lib tar:xz
USE_GL= gl
-USE_QT5= buildtools concurrent core declarative designer gui help \
+USE_QT5= buildtools concurrent core designer gui help \
linguist network printsupport qdoc qml quick quickcontrols \
script script sql svg webkit widgets xml xmlpatterns
Modified: head/graphics/luminance-qt5/Makefile
==============================================================================
--- head/graphics/luminance-qt5/Makefile Mon May 15 15:46:02 2017 (r440940)
+++ head/graphics/luminance-qt5/Makefile Mon May 15 15:52:22 2017 (r440941)
@@ -3,7 +3,7 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.4.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
PKGNAMESUFFIX= -qt5
@@ -23,7 +23,7 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-flo
libboost_system.so:devel/boost-libs
USES= cmake:outsource jpeg pkgconfig tar:bzip2
-USE_QT5= concurrent declarative gui printsupport sql webkit xml \
+USE_QT5= concurrent gui printsupport sql webkit xml \
buildtools_build linguist_build qmake_build \
imageformats_run
INSTALLS_ICONS= yes
@@ -35,6 +35,11 @@ CONFLICTS_INSTALL= luminance-hdr-[0-9]*
OPTIONS_DEFINE= DOCS
post-patch:
+# Remove the non-required dependency on Qt5 Declarative. This can be dropped
+# once www/qt5-webengine lands in the portstree and this port can be updated to
+# a version >= 2.5.0.
+ @${REINPLACE_CMD} -e '/Qt5Declarative/d' \
+ ${WRKSRC}/CMakeLists.txt
# Do not install yet another copy of GPL (we use license framework instead)
# and fix installation path for docs (but not for internal help files)
@${REINPLACE_CMD} -e '/LICENSE/d ; \
Modified: head/polish/kadu/Makefile
==============================================================================
--- head/polish/kadu/Makefile Mon May 15 15:46:02 2017 (r440940)
+++ head/polish/kadu/Makefile Mon May 15 15:52:22 2017 (r440941)
@@ -3,7 +3,7 @@
PORTNAME= kadu
PORTVERSION= 4.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= polish net-im
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
@@ -40,7 +40,7 @@ USES= cmake compiler:c++11-lib execinfo
libarchive pkgconfig readline tar:bzip2
USE_XORG= x11 xext xfixes xscrnsaver
USE_GNOME= glib20
-USE_QT5= concurrent core dbus declarative gui multimedia network \
+USE_QT5= concurrent core dbus gui multimedia network \
qml quick script scripttools sql webkit widgets x11extras \
xml xmlpatterns buildtools_build linguisttools_build \
qmake_build imageformats_run sql-sqlite3_run
Modified: head/x11-toolkits/qt5-declarative/Makefile
==============================================================================
--- head/x11-toolkits/qt5-declarative/Makefile Mon May 15 15:46:02 2017 (r440940)
+++ head/x11-toolkits/qt5-declarative/Makefile Mon May 15 15:52:22 2017 (r440941)
@@ -8,6 +8,9 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt 4-compatible declarative UI framework
+DEPRECATED= Has not been released since Qt 5.5 -- installation can lead to runtime conflicts with qt5-quick
+EXPIRATION_DATE= 2017-06-30
+
DISTINFO_FILE= ${MASTERDIR}/distinfo
QT5_VERSION= ${DISTVERSION}
More information about the svn-ports-head
mailing list