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

Carlos De Maine null at kde.org
Tue Nov 5 04:06:54 GMT 2024


Git commit b682fe90f9962d02d2fc6bd13ef36c3526b3269b by Carlos De Maine.
Committed on 05/11/2024 at 04:06.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "backport harald's qt6.8 build fix"

This reverts commit a54f09ff49e0bf42f15625a045b9ebf47af73863

(cherry picked from commit 2d05e9f5f15ed36bffef79a256c970d4e2e586fc)

Co-authored-by: Carlos De Maine <carlosd.kde at gmail.com>

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

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

diff --git a/debian/patches/fix_qt6.8_build.diff b/debian/patches/fix_qt6.8_build.diff
deleted file mode 100644
index a8fe881..0000000
--- a/debian/patches/fix_qt6.8_build.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index ac1837b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_qt6.8_build.diff


More information about the Neon-commits mailing list