mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00
Code Issues Releases Activity

Fix build of x11-toolkits/qt5-charts after r427356.

Browse Source 
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)
This commit is contained in:
Tobias C. Berner 2016-12-02 11:29:19 +00:00
parent 3d8bb1a40a
commit f38d6cb92b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427551
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11-toolkits/qt5-charts/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= charts
DISTVERSIONPREFIX= release-
DISTVERSION= 2.1.0
PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-

14
x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro Normal file
View File

@ -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 += \

16
x11-toolkits/qt5-charts/pkg-plist
View File

@ -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