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

79
 
1
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
2
--- qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa    2023-09-29 18:55:55.000000000 +0200
3
+++ qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake 2024-11-11 13:29:36.265440550 +0100
4
@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
5
   /usr/include/qwt5
6
   /usr/include/qwt6-qt5
7
   /usr/include/qt5/qwt
8
+  /usr/include/qt5/qwt6
9
   /opt/local/include/qwt
10
   /sw/include/qwt
11
   /usr/local/lib/qwt.framework/Headers
12
@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
13
   set(QWT_VERSION "No Version")
14
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
15
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
16
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
17
18
   message(STATUS "QWT Version: ${QWT_VERSION}")
19
   if(NOT QWT_WRONG_VERSION)
20
     set(QWT_FOUND TRUE)
21
   else(NOT QWT_WRONG_VERSION)
22
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
23
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
24
   endif(NOT QWT_WRONG_VERSION)
25
26
 endif(QWT_INCLUDE_DIRS)
27
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
28
--- qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa    2023-09-29 18:55:55.000000000 +0200
29
+++ qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake 2024-11-11 13:30:10.869310688 +0100
30
@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
31
   /usr/include/qwt5
32
   /usr/include/qwt6-qt5
33
   /usr/include/qt5/qwt
34
+  /usr/include/qt5/qwt6
35
   /opt/local/include/qwt
36
   /sw/include/qwt
37
   /usr/local/lib/qwt.framework/Headers
38
@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
39
   set(QWT_VERSION "No Version")
40
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
41
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
42
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
43
44
   message(STATUS "QWT Version: ${QWT_VERSION}")
45
   if(NOT QWT_WRONG_VERSION)
46
     set(QWT_FOUND TRUE)
47
   else(NOT QWT_WRONG_VERSION)
48
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
49
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
50
   endif(NOT QWT_WRONG_VERSION)
51
52
 endif(QWT_INCLUDE_DIRS)
53
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
54
--- qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa    2023-09-29 18:55:55.000000000 +0200
55
+++ qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake 2024-11-11 13:30:43.166700555 +0100
56
@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
57
   /usr/include/qwt5
58
   /usr/include/qwt6-qt5
59
   /usr/include/qt5/qwt
60
+  /usr/include/qt5/qwt6
61
   /opt/local/include/qwt
62
   /sw/include/qwt
63
   /usr/local/lib/qwt.framework/Headers
64
@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
65
   set(QWT_VERSION "No Version")
66
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
67
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
68
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
69
70
   message(STATUS "QWT Version: ${QWT_VERSION}")
71
   if(NOT QWT_WRONG_VERSION)
72
     set(QWT_FOUND TRUE)
73
   else(NOT QWT_WRONG_VERSION)
74
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
75
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
76
   endif(NOT QWT_WRONG_VERSION)
77
78
 endif(QWT_INCLUDE_DIRS)
79
​
Locations
Help
Contact