Projects
home:wkazubski:hamradio
qwt6-qt5
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 19
View file
qwt-6.2.0-qt6-pkgconfig.patch
Added
@@ -0,0 +1,37 @@ +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} +- QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport ++ 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 += 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) ++}
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.