qgis{-qt6,}-dev: revert patch causing sip failure

jef-n · May 16, 2024 · 97c82f6 · 97c82f6
1 parent a75637c
commit 97c82f6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 56 deletions.
diff --git a/src/qgis-dev/osgeo4w/patch b/src/qgis-dev/osgeo4w/patch
@@ -8666,34 +8666,6 @@ index e694c1e613..0000000000
 -!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection"
 -
 -!endif # !___X64__NSH___
-diff --git a/python/PyQt6/gui/gui_auto.sip b/python/PyQt6/gui/gui_auto.sip
-index c668cc6c9a..46863b186a 100644
---- a/python/PyQt6/gui/gui_auto.sip
-+++ b/python/PyQt6/gui/gui_auto.sip
-@@ -325,7 +325,9 @@
- %Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsdoublespinbox.sip
- %Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
-+%If ( HAVE_QSCI_SIP )
- %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
-+%End
- %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
- %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
-diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
-index c668cc6c9a..46863b186a 100644
---- a/python/gui/gui_auto.sip
-+++ b/python/gui/gui_auto.sip
-@@ -325,7 +325,9 @@
- %Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsdoublespinbox.sip
- %Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
-+%If ( HAVE_QSCI_SIP )
- %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
-+%End
- %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
- %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
 diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
 index e9847f5041..3bd86feef7 100644
 --- a/src/app/CMakeLists.txt

diff --git a/src/qgis-qt6-dev/osgeo4w/patch b/src/qgis-qt6-dev/osgeo4w/patch
@@ -8666,34 +8666,6 @@ index e694c1e613..0000000000
 -!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection"
 -
 -!endif # !___X64__NSH___
-diff --git a/python/PyQt6/gui/gui_auto.sip b/python/PyQt6/gui/gui_auto.sip
-index c668cc6c9a..46863b186a 100644
---- a/python/PyQt6/gui/gui_auto.sip
-+++ b/python/PyQt6/gui/gui_auto.sip
-@@ -325,7 +325,9 @@
- %Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsdoublespinbox.sip
- %Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
-+%If ( HAVE_QSCI_SIP )
- %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
-+%End
- %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
- %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
-diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
-index c668cc6c9a..46863b186a 100644
---- a/python/gui/gui_auto.sip
-+++ b/python/gui/gui_auto.sip
-@@ -325,7 +325,9 @@
- %Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsdoublespinbox.sip
- %Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
-+%If ( HAVE_QSCI_SIP )
- %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
-+%End
- %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
- %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
- %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
 diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
 index e9847f5041..3bd86feef7 100644
 --- a/src/app/CMakeLists.txt