kdevelop_kf6, downgrade to 25.08.3 (Qt6.8 failure for new one?) (#13446)

dev-util/kdevelop/kdevelop_kf6-25.08.3.recipe

@@ -9,7 +9,7 @@ LICENSE="GNU GPL v3
 	GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kdevelop-$portVersion.tar.xz"
-CHECKSUM_SHA256="efff758bd586af5d82329d2f340abfe646673d89fc6f5770838aea49f73f3f5f"
+CHECKSUM_SHA256="4d2b92cf37a9a3324dd9137075c5f552047bd88a673420aa1484fcde79bace92"
 SOURCE_DIR="kdevelop-$portVersion"
 PATCHES="kdevelop-$portVersion.patchset"
 ADDITIONAL_FILES="kdevelop.rdef.in"
@@ -17,7 +17,7 @@ ADDITIONAL_FILES="kdevelop.rdef.in"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="6.4.251200"
+libVersion="6.2.250803"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 clangVer="20"
@@ -166,6 +166,7 @@ BUILD_REQUIRES="
 	devel:libKF6Archive$secondaryArchSuffix
 	devel:libKF6ConfigCore$secondaryArchSuffix
 	devel:libKF6Crash$secondaryArchSuffix
+	devel:libKF6DocTools$secondaryArchSuffix
 	devel:libKF6GuiAddons$secondaryArchSuffix
 	devel:libKF6I18n$secondaryArchSuffix
 	devel:libKF6IconThemes$secondaryArchSuffix
@@ -222,6 +223,9 @@ TEST_REQUIRES="
 
 PATCH()
 {
+	# disable docs generation until libxml package is fixed
+	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
+	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
 	# use Haiku's icon theme
 	sed -e 's,\    KIconTheme::initTheme();,\//    KIconTheme::initTheme();,g' -i app/main.cpp
 	# disable searching for qtwebengine
@@ -239,9 +243,12 @@ BUILD()
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DCMAKE_AUTOGEN_PARALLEL=1 \
+		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
+		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
+		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DCLANG_BUILTIN_DIR="$BUILTIN_DIR" \
 		-DBUILD_DOC_VIEWER=OFF \
-		-DBUILD_DOC=OFF \
 		-DBUILD_TESTING=ON \
 		-Wno-dev
 

dev-util/kdevelop/patches/kdevelop-25.08.3.patchset

@@ -57,7 +57,7 @@ index 74759ff..f710a12 100644
  install(FILES
      documentationfindwidget.h
 diff --git a/kdevplatform/documentation/standarddocumentationview.cpp b/kdevplatform/documentation/standarddocumentationview.cpp
-index 969eb65..d13f568 100644
+index e5e09be..2d4f759 100644
 --- a/kdevplatform/documentation/standarddocumentationview.cpp
 +++ b/kdevplatform/documentation/standarddocumentationview.cpp
 @@ -5,6 +5,7 @@
@@ -90,12 +90,12 @@ index 969eb65..d13f568 100644
  class StandardDocumentationPage : public QWebEnginePage
  {
      Q_OBJECT
-@@ -67,13 +71,16 @@ private:
+@@ -67,13 +71,15 @@ private:
      KDevelop::StandardDocumentationView* const m_view;
      bool m_isDelegating = false;
  };
+-
 +#endif
- 
  } // unnamed namespace
  
  void StandardDocumentationView::registerCustomUrlSchemes()
@@ -107,7 +107,7 @@ index 969eb65..d13f568 100644
  }
  
  class KDevelop::StandardDocumentationViewPrivate
-@@ -82,18 +89,23 @@ public:
+@@ -82,18 +88,23 @@ public:
      ZoomController* m_zoomController = nullptr;
      IDocumentation::Ptr m_doc;
  
@@ -131,7 +131,7 @@ index 969eb65..d13f568 100644
          // prevent QWebEngine (Chromium) from overriding the signal handlers of KCrash
          const auto chromiumFlags = qgetenv("QTWEBENGINE_CHROMIUM_FLAGS");
          if (!chromiumFlags.contains("disable-in-process-stack-traces")) {
-@@ -110,6 +122,7 @@ public:
+@@ -110,6 +121,7 @@ public:
  
          // The event filter is necessary for handling mouse events since they are swallowed by QWebEngineView.
          m_view->installEventFilter(parent);
@@ -139,10 +139,11 @@ index 969eb65..d13f568 100644
      }
  };
  
-@@ -119,12 +132,16 @@ StandardDocumentationView::StandardDocumentationView(DocumentationFindWidget* fi
+@@ -118,13 +130,16 @@ StandardDocumentationView::StandardDocumentationView(DocumentationFindWidget* fi
+     , d_ptr(new StandardDocumentationViewPrivate)
  {
      Q_D(StandardDocumentationView);
- 
+-
 +#if BUILD_DOC_VIEWER
      auto mainLayout = new QVBoxLayout(this);
      mainLayout->setContentsMargins(0, 0, 0, 0);
@@ -156,7 +157,7 @@ index 969eb65..d13f568 100644
  
      findWidget->setEnabled(true);
      connect(findWidget, &DocumentationFindWidget::searchRequested, this, &StandardDocumentationView::search);
-@@ -137,13 +154,16 @@ KDevelop::StandardDocumentationView::~StandardDocumentationView()
+@@ -137,13 +152,16 @@ KDevelop::StandardDocumentationView::~StandardDocumentationView()
      Q_D(StandardDocumentationView);
  
      // Prevent getting a loadFinished() signal on destruction.
@@ -173,7 +174,7 @@ index 969eb65..d13f568 100644
      QWebEnginePage::FindFlags ff = {};
      if(options & DocumentationFindWidget::Previous)
          ff |= QWebEnginePage::FindBackward;
-@@ -152,12 +172,14 @@ void StandardDocumentationView::search ( const QString& text, DocumentationFindW
+@@ -152,12 +170,14 @@ void StandardDocumentationView::search ( const QString& text, DocumentationFindW
          ff |= QWebEnginePage::FindCaseSensitively;
  
      d->m_view->page()->findText(text, ff);
@@ -188,7 +189,7 @@ index 969eb65..d13f568 100644
      QWebEnginePage::FindFlags findFlags;
  
      if (options & DocumentationFindWidget::MatchCase)
-@@ -173,6 +195,7 @@ void StandardDocumentationView::searchIncremental(const QString& text, Documenta
+@@ -173,6 +193,7 @@ void StandardDocumentationView::searchIncremental(const QString& text, Documenta
      // casesensitivity, that global matches are not updated and the ones with non-matching casing
      // still active. no workaround so far.
      d->m_view->page()->findText(text, findFlags);
@@ -196,7 +197,7 @@ index 969eb65..d13f568 100644
  }
  
  void StandardDocumentationView::finishSearch()
-@@ -180,7 +203,9 @@ void StandardDocumentationView::finishSearch()
+@@ -180,7 +201,9 @@ void StandardDocumentationView::finishSearch()
      Q_D(StandardDocumentationView);
  
      // passing empty string to reset search, as told in API docs
@@ -206,7 +207,7 @@ index 969eb65..d13f568 100644
  }
  
  void StandardDocumentationView::initZoom(const QString& configSubGroup)
-@@ -236,6 +261,7 @@ void StandardDocumentationView::setOverrideCssCode(const QByteArray& cssCode)
+@@ -235,6 +258,7 @@ void StandardDocumentationView::setOverrideCssCode(const QByteArray& cssCode)
  {
      Q_D(StandardDocumentationView);
  
@@ -214,7 +215,7 @@ index 969eb65..d13f568 100644
      const auto scriptName = QStringLiteral("OverrideCss");
      auto& scripts = d->m_view->page()->scripts();
  
-@@ -269,20 +295,25 @@ void StandardDocumentationView::setOverrideCssCode(const QByteArray& cssCode)
+@@ -268,20 +292,25 @@ void StandardDocumentationView::setOverrideCssCode(const QByteArray& cssCode)
      script.setWorldId(QWebEngineScript::ApplicationWorld);
  
      scripts.insert(script);
@@ -240,7 +241,7 @@ index 969eb65..d13f568 100644
  }
  
  void KDevelop::StandardDocumentationView::installUrlSchemeHandler(const QByteArray& scheme,
-@@ -290,25 +321,30 @@ void KDevelop::StandardDocumentationView::installUrlSchemeHandler(const QByteArr
+@@ -289,25 +318,30 @@ void KDevelop::StandardDocumentationView::installUrlSchemeHandler(const QByteArr
  {
      Q_D(StandardDocumentationView);
  
@@ -268,12 +269,12 @@ index 969eb65..d13f568 100644
      Q_D(StandardDocumentationView);
  
 +#if BUILD_DOC_VIEWER
+     auto menu = new QMenu(this);
      auto copyAction = d->m_view->pageAction(QWebEnginePage::Copy);
-     if (!copyAction) {
-         return nullptr;
-@@ -318,12 +354,16 @@ QMenu* StandardDocumentationView::createStandardContextMenu()
-     auto* const menu = new QMenu(this);
-     menu->addAction(copyAction);
+     if (copyAction) {
+@@ -315,12 +349,16 @@ QMenu* StandardDocumentationView::createStandardContextMenu()
+         menu->addAction(copyAction);
+     }
      return menu;
 +#else
 +    return nullptr;
@@ -288,7 +289,7 @@ index 969eb65..d13f568 100644
      if (object == d->m_view) {
          /* HACK / Workaround for QTBUG-43602
           * Need to set an eventFilter on the child of WebengineView because it swallows
-@@ -362,6 +402,9 @@ bool StandardDocumentationView::eventFilter(QObject* object, QEvent* event)
+@@ -359,6 +397,9 @@ bool StandardDocumentationView::eventFilter(QObject* object, QEvent* event)
          }
      }
      return QWidget::eventFilter(object, event);
@@ -298,7 +299,7 @@ index 969eb65..d13f568 100644
  }
  
  void StandardDocumentationView::contextMenuEvent(QContextMenuEvent* event)
-@@ -379,7 +422,9 @@ void StandardDocumentationView::updateZoomFactor(double zoomFactor)
+@@ -377,7 +418,9 @@ void StandardDocumentationView::updateZoomFactor(double zoomFactor)
  {
      Q_D(StandardDocumentationView);