[neon/kde/spectacle/Neon/release] debian/patches: backport harald's qt6.8 build fix

Carlos De Maine null at kde.org
Tue Nov 5 03:46:03 GMT 2024


Git commit a54f09ff49e0bf42f15625a045b9ebf47af73863 by Carlos De Maine.
Committed on 05/11/2024 at 03:46.
Pushed by carlosdem into branch 'Neon/release'.

backport harald's qt6.8 build fix

A  +17   -0    debian/patches/fix_qt6.8_build.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/spectacle/-/commit/a54f09ff49e0bf42f15625a045b9ebf47af73863

diff --git a/debian/patches/fix_qt6.8_build.diff b/debian/patches/fix_qt6.8_build.diff
new file mode 100644
index 0000000..a8fe881
--- /dev/null
+++ b/debian/patches/fix_qt6.8_build.diff
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41297b6f9bc66157fe029fe5da79949ce1d58b40..9290cf523f151b0fba552df69c92429f610ada56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,12 @@ find_package(
+ )
+ qt_policy(SET QTP0001 NEW)
+ 
++if(Qt6_VERSION VERSION_EQUAL 6.8.0)
++    # https://bugreports.qt.io/browse/QTBUG-129797
++    message(NOTICE "Qt6_VERSION: ${Qt6_VERSION} detected. Enabling CAST_FROM_ASCII")
++    remove_definitions(-DQT_NO_CAST_FROM_ASCII)
++endif()
++
+ find_package(
+     KF6 ${KF_MIN_VERSION} REQUIRED
+         CoreAddons
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ac1837b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_qt6.8_build.diff


More information about the Neon-commits mailing list