diff --git a/qwt-6.2.0-qt6-pkgconfig.patch b/qwt-6.2.0-qt6-pkgconfig.patch index 0d943ff..2783db1 100644 --- a/qwt-6.2.0-qt6-pkgconfig.patch +++ b/qwt-6.2.0-qt6-pkgconfig.patch @@ -1,7 +1,8 @@ -diff -rupN --no-dereference qwt-6.2.0/src/src.pro qwt-6.2.0-new/src/src.pro ---- qwt-6.2.0/src/src.pro 2021-07-18 13:19:33.628367286 +0200 -+++ qwt-6.2.0-new/src/src.pro 2022-11-29 15:38:15.226070441 +0100 -@@ -82,7 +82,7 @@ contains(QWT_CONFIG, QwtPkgConfig) { +Index: qwt-6.2.0/src/src.pro +=================================================================== +--- qwt-6.2.0.orig/src/src.pro ++++ qwt-6.2.0/src/src.pro +@@ -82,14 +82,14 @@ contains(QWT_CONFIG, QwtPkgConfig) { greaterThan(QT_MAJOR_VERSION, 4) { QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME} @@ -9,4 +10,28 @@ diff -rupN --no-dereference qwt-6.2.0/src/src.pro qwt-6.2.0-new/src/src.pro + QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}Widgets Qt$${QT_MAJOR_VERSION}Concurrent Qt$${QT_MAJOR_VERSION}PrintSupport contains(QWT_CONFIG, QwtSvg) { - QMAKE_PKGCONFIG_REQUIRES += Qt5Svg +- QMAKE_PKGCONFIG_REQUIRES += Qt5Svg ++ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}Svg + } + + contains(QWT_CONFIG, QwtOpenGL) { +- QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL ++ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}OpenGL + } + + QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc +Index: qwt-6.2.0/qwt.prf +=================================================================== +--- qwt-6.2.0.orig/qwt.prf ++++ qwt-6.2.0/qwt.prf +@@ -44,4 +44,9 @@ else { + } + + # QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} +-qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt) ++greaterThan(QT_MAJOR_VERSION,5) { ++ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt6) ++} ++else { ++ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt5) ++}