[rpms/opencv] opencv5: Add patch from Atri Bhattacharya to fix build with Qt 6.9

[rpms/opencv] opencv5: Add patch from Atri Bhattacharya to fix build with Qt 6.9

[Adam Williamson]

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : f516d8688f59567ad013446528b3b9774bad834e
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2025-07-08T16:13:13-07:00
Stats  : +18/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/f516d8688f59567ad013446528b3b9774bad834e?branch=opencv5

Log:
Add patch from Atri Bhattacharya to fix build with Qt 6.9

---
diff --git a/opencv.spec b/opencv.spec
index ee1020e..e42cce6 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -120,6 +120,9 @@ Patch12:        0007-fix-for-large-tEXt-chunk.patch
 Patch13:        0008-Merge-pull-request-26854-from-vrabaud-png_leak.patch
 Patch14:        0009-Merge-pull-request-26872-from-sturkmen72-ImageEncode.patch
 Patch15:        0010-Merge-pull-request-26915-from-mshabunin-fix-png-be.patch
+# Fix build with Qt 6.9, by Atri Bhattacharya (thanks)
+# https://github.com/opencv/opencv/issues/27223#issuecomment-2797750952
+Patch16:        qt69.patch
 
 
 BuildRequires:  gcc-c++
@@ -434,6 +437,8 @@ popd &>/dev/null
 %patch -P 14 -p1 -b .png9
 %patch -P 15 -p1 -b .png10
 
+%patch -P 99 -p1 -b .qt69
+
 pushd %{name}_contrib-%{version}
 #patch1 -p1 -b .install_cvv
 popd
@@ -609,8 +614,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 
 
 %changelog
-* Wed Jun 04 2025 Python Maint <python-maint@redhat.com> - 4.11.0-4
+* Tue Jul 08 2025 Adam Williamson <awilliam@redhat.com> - 4.11.0-4
 - Rebuilt for Python 3.14
+- Add patch from Atri Bhattacharya to fix build with Qt 6.9
 
 * Tue Mar 11 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 4.11.0-3
 - Use Qt6 in highgui and cvv

diff --git a/qt69.patch b/qt69.patch
new file mode 100644
index 0000000..fa59991
--- /dev/null
+++ b/qt69.patch
@@ -0,0 +1,11 @@
+--- opencv-4.11.0/modules/highgui/CMakeLists.txt	2025-01-08 04:47:46.000000000 -0800
++++ opencv-4.11.0/modules/highgui/CMakeLists.txt.new	2025-07-08 15:54:10.138078285 -0700
+@@ -125,7 +125,7 @@
+     endif()
+ 
+     foreach(dt_dep ${qt_deps})
+-      add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS})
++      link_libraries(${Qt${QT_VERSION_MAJOR}${dt_dep}})
+       include_directories(${Qt${QT_VERSION_MAJOR}${dt_dep}_INCLUDE_DIRS})
+       list(APPEND HIGHGUI_LIBRARIES ${Qt${QT_VERSION_MAJOR}${dt_dep}_LIBRARIES})
+     endforeach()