rpm/qwt6
SHA256
1
0
Fork 0
forked from pool/qwt6
Code Pull Requests Activity

Accepting request 1083625 from home:alois:branches:devel:libraries:c_c++

Browse Source 
fix patch

OBS-URL: https://build.opensuse.org/request/show/1083625
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=19
This commit is contained in:
Luigi Baldoni 2023-04-29 09:02:17 +00:00 committed by Git OBS Bridge
parent 51a74be344
commit 7c62b9a4c0
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qwt-6.2.0-qt6-pkgconfig.patch
View File

@ -1,7 +1,8 @@
diff -rupN --no-dereference qwt-6.2.0/src/src.pro qwt-6.2.0-new/src/src.pro Index: qwt-6.2.0/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 --- qwt-6.2.0.orig/src/src.pro
@@ -82,7 +82,7 @@ contains(QWT_CONFIG, QwtPkgConfig) { +++ qwt-6.2.0/src/src.pro
@@ -82,14 +82,14 @@ contains(QWT_CONFIG, QwtPkgConfig) {
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME} 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 + QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}Widgets Qt$${QT_MAJOR_VERSION}Concurrent Qt$${QT_MAJOR_VERSION}PrintSupport
contains(QWT_CONFIG, QwtSvg) { 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)
+}