File qt-dab-6.1-use-qwt6-qt5.patch of Package qt-dab

File qt-dab-6.1-use-qwt6-qt5.patch of Package qt-dab (Revision 0c010b0b7adc60488dbd8c79ae2445a0)

Currently displaying revision 0c010b0b7adc60488dbd8c79ae2445a0 , Show latest

diff -up qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake
--- qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
+++ qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake	2024-11-11 13:29:36.265440550 +0100
@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
   /usr/include/qwt5
   /usr/include/qwt6-qt5
   /usr/include/qt5/qwt
+  /usr/include/qt5/qwt6
   /opt/local/include/qwt
   /sw/include/qwt
   /usr/local/lib/qwt.framework/Headers
@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
   set(QWT_VERSION "No Version")
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
 
   message(STATUS "QWT Version: ${QWT_VERSION}")
   if(NOT QWT_WRONG_VERSION)
     set(QWT_FOUND TRUE)
   else(NOT QWT_WRONG_VERSION)
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
   endif(NOT QWT_WRONG_VERSION)
 
 endif(QWT_INCLUDE_DIRS)
diff -up qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake
--- qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
+++ qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake	2024-11-11 13:30:10.869310688 +0100
@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
   /usr/include/qwt5
   /usr/include/qwt6-qt5
   /usr/include/qt5/qwt
+  /usr/include/qt5/qwt6
   /opt/local/include/qwt
   /sw/include/qwt
   /usr/local/lib/qwt.framework/Headers
@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
   set(QWT_VERSION "No Version")
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
 
   message(STATUS "QWT Version: ${QWT_VERSION}")
   if(NOT QWT_WRONG_VERSION)
     set(QWT_FOUND TRUE)
   else(NOT QWT_WRONG_VERSION)
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
   endif(NOT QWT_WRONG_VERSION)
 
 endif(QWT_INCLUDE_DIRS)
diff -up qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake
--- qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
+++ qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake	2024-11-11 13:30:43.166700555 +0100
@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
   /usr/include/qwt5
   /usr/include/qwt6-qt5
   /usr/include/qt5/qwt
+  /usr/include/qt5/qwt6
   /opt/local/include/qwt
   /sw/include/qwt
   /usr/local/lib/qwt.framework/Headers
@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
   set(QWT_VERSION "No Version")
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
 
   message(STATUS "QWT Version: ${QWT_VERSION}")
   if(NOT QWT_WRONG_VERSION)
     set(QWT_FOUND TRUE)
   else(NOT QWT_WRONG_VERSION)
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
   endif(NOT QWT_WRONG_VERSION)
 
 endif(QWT_INCLUDE_DIRS)