svn commit: r427551 - in head/x11-toolkits/qt5-charts: . files
Tobias C. Berner
tcberner at FreeBSD.org
Fri Dec 2 11:29:21 UTC 2016
Author: tcberner
Date: Fri Dec 2 11:29:19 2016
New Revision: 427551
URL: https://svnweb.freebsd.org/changeset/ports/427551
Log:
Fix build of x11-toolkits/qt5-charts after r427356.
Unfortunately due to a wrong assumption, I missed the new
port x11-toolkits/qt5-charts in r427356, so this port
wrongly used QT_LIBDIR while not being part of QT_DIST (yet).
While here, also add a patch to install the pkgconfig file
to the proper location (another error, caused by not
being QT_DIST-ed).
Approved by: rakuco (mentor)
Added:
head/x11-toolkits/qt5-charts/files/
head/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro (contents, props changed)
Modified:
head/x11-toolkits/qt5-charts/Makefile
head/x11-toolkits/qt5-charts/pkg-plist
Modified: head/x11-toolkits/qt5-charts/Makefile
==============================================================================
--- head/x11-toolkits/qt5-charts/Makefile Fri Dec 2 11:02:13 2016 (r427550)
+++ head/x11-toolkits/qt5-charts/Makefile Fri Dec 2 11:29:19 2016 (r427551)
@@ -3,6 +3,7 @@
PORTNAME= charts
DISTVERSIONPREFIX= release-
DISTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
Added: head/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro Fri Dec 2 11:29:19 2016 (r427551)
@@ -0,0 +1,14 @@
+Fix the pkgconfig install path.
+
+--- src/charts/charts.pro.orig 2016-12-01 12:57:55 UTC
++++ src/charts/charts.pro
+@@ -17,6 +17,9 @@ load(qt_module)
+ QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
+ QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
+
++# Properly set up the pkgconfig install path -- relative to lib/
++QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig
++
+ ############################# SOURCES ##########################################
+
+ SOURCES += \
Modified: head/x11-toolkits/qt5-charts/pkg-plist
==============================================================================
--- head/x11-toolkits/qt5-charts/pkg-plist Fri Dec 2 11:02:13 2016 (r427550)
+++ head/x11-toolkits/qt5-charts/pkg-plist Fri Dec 2 11:29:19 2016 (r427551)
@@ -225,14 +225,13 @@
%%QT_INCDIR%%/QtCharts/qxylegendmarker.h
%%QT_INCDIR%%/QtCharts/qxymodelmapper.h
%%QT_INCDIR%%/QtCharts/qxyseries.h
-%%QT_LIBDIR%%/cmake/Qt5Charts/Qt5ChartsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Charts/Qt5ChartsConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Charts.prl
-%%QT_LIBDIR%%/libQt5Charts.so
-%%QT_LIBDIR%%/libQt5Charts.so.2
-%%QT_LIBDIR%%/libQt5Charts.so.2.1
-%%QT_LIBDIR%%/libQt5Charts.so.2.1.0
-%%QT_LIBDIR%%/pkgconfig/Qt5Charts.pc
+lib/cmake/Qt5Charts/Qt5ChartsConfig.cmake
+lib/cmake/Qt5Charts/Qt5ChartsConfigVersion.cmake
+lib/libQt5Charts.prl
+lib/libQt5Charts.so
+lib/libQt5Charts.so.2
+lib/libQt5Charts.so.2.1
+lib/libQt5Charts.so.2.1.0
%%QT_MKSPECDIR%%/modules/qt_lib_charts.pri
%%QT_MKSPECDIR%%/modules/qt_lib_charts_private.pri
%%QT_QMLDIR%%/QtCharts/designer/ChartViewSpecifics.qml
@@ -288,3 +287,4 @@
%%QT_QMLDIR%%/QtCharts/libqtchartsqml2.so
%%QT_QMLDIR%%/QtCharts/plugins.qmltypes
%%QT_QMLDIR%%/QtCharts/qmldir
+libdata/pkgconfig/Qt5Charts.pc
More information about the svn-ports-head
mailing list