[rpms/extra-cmake-modules] f43: Fix for KDE projects not being able to find python

[rpms/extra-cmake-modules] f43: Fix for KDE projects not being able to find python

[Steve Cossette]

A new commit has been pushed.

Repo   : rpms/extra-cmake-modules
Branch : f43
Commit : 0da59e45f96323adebe3e3ba28170ae232b5e1d3
Author : Steve Cossette <farchord@gmail.com>
Date   : 2026-05-14T11:02:39-04:00
Stats  : +62/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/extra-cmake-modules/c/0da59e45f96323adebe3e3ba28170ae232b5e1d3?branch=f43

Log:
Fix for KDE projects not being able to find python

---
diff --git a/0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch b/0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
new file mode 100644
index 0000000..17018a7
--- /dev/null
+++ b/0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
@@ -0,0 +1,55 @@
+From 79802fdb938ac3b3c6fc0b57eb2fcbf60100e0b0 Mon Sep 17 00:00:00 2001
+From: Steve Cossette <farchord@gmail.com>
+Date: Wed, 13 May 2026 21:47:52 -0400
+Subject: [PATCH] Revert "Add PYTHONPATH to prefix.sh if python is available"
+
+This reverts commit e46088158e5631417602322ecdc08cc692192134.
+---
+ kde-modules/KDESetupPrefixScript.cmake | 9 ---------
+ kde-modules/prefix.sh.cmake            | 2 --
+ kde-modules/prefix.sh.fish.cmake       | 2 --
+ 3 files changed, 13 deletions(-)
+
+diff --git a/kde-modules/KDESetupPrefixScript.cmake b/kde-modules/KDESetupPrefixScript.cmake
+index a1cc261a..b2bae93b 100644
+--- a/kde-modules/KDESetupPrefixScript.cmake
++++ b/kde-modules/KDESetupPrefixScript.cmake
+@@ -15,15 +15,6 @@ if (CMAKE_CROSSCOMPILING)
+     return()
+ endif()
+ 
+-find_package(Python3 COMPONENTS Interpreter)
+-if (Python3_EXECUTABLE)
+-    execute_process(COMMAND ${Python3_EXECUTABLE} -Esc "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${CMAKE_INSTALL_PREFIX}', 'base': '${CMAKE_INSTALL_PREFIX}'}))" OUTPUT_VARIABLE sysconfig_output)
+-    string(STRIP ${sysconfig_output} PYTHON_INSTALL_DIR)
+-
+-    set(SH_EXPORT_PYTHONPATH "export PYTHONPATH=\"${PYTHON_INSTALL_DIR}\":$PYTHONPATH")
+-    set(FISH_EXPORT_PYTHONPATH "set -x --path PYTHONPATH \"${PYTHON_INSTALL_DIR}\" $PYTHONPATH")
+-endif()
+-
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/prefix.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh @ONLY)
+ 
+ find_program(FISH_EXECUTABLE fish)
+diff --git a/kde-modules/prefix.sh.cmake b/kde-modules/prefix.sh.cmake
+index 2d75471a..43b41e9f 100644
+--- a/kde-modules/prefix.sh.cmake
++++ b/kde-modules/prefix.sh.cmake
+@@ -14,5 +14,3 @@ export QT_QUICK_CONTROLS_STYLE_PATH=@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2
+ export MANPATH=@KDE_INSTALL_FULL_DATADIR@/man:${MANPATH:-/usr/local/share/man:/usr/share/man}
+ 
+ export SASL_PATH=@KDE_INSTALL_FULL_LIBDIR@/sasl2:${SASL_PATH:-/usr/@CMAKE_INSTALL_LIBDIR@/sasl2}
+-
+-@SH_EXPORT_PYTHONPATH@
+diff --git a/kde-modules/prefix.sh.fish.cmake b/kde-modules/prefix.sh.fish.cmake
+index 3cb4c4a0..d59c1b87 100644
+--- a/kde-modules/prefix.sh.fish.cmake
++++ b/kde-modules/prefix.sh.fish.cmake
+@@ -20,5 +20,3 @@ set -x --path QT_PLUGIN_PATH "@KDE_INSTALL_FULL_QTPLUGINDIR@" $QT_PLUGIN_PATH
+ set -x --path QML2_IMPORT_PATH "@KDE_INSTALL_FULL_QMLDIR@" $QML2_IMPORT_PATH
+ 
+ set -x --path QT_QUICK_CONTROLS_STYLE_PATH "@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/" $QT_QUICK_CONTROLS_STYLE_PATH
+-
+-@FISH_EXPORT_PYTHONPATH@
+-- 
+2.54.0
+

diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index 599a7b7..eaf52cd 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -10,7 +10,7 @@
 Name:    extra-cmake-modules
 Summary: Additional modules for CMake build system
 Version: 6.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # kde-modules/clang-format.cmake is MIT
 License: BSD-3-Clause AND BSD-2-Clause AND MIT
 URL:     https://api.kde.org/ecm/
@@ -22,6 +22,9 @@ BuildArch:      noarch
 # do not unconditionally link in base/core libpoppler library
 Patch2: extra-cmake-modules-5.39.0-poppler_overlinking.patch
 
+# test
+Patch3: 0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
+
 ## downstream patches
 
 BuildRequires: kf6-rpm-macros
@@ -85,6 +88,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_vpath_builddir} ||:
 
 
 %changelog
+* Thu May 14 2026 Steve Cossette <farchord@gmail.com> - 6.26.0-2
+- Fix for kde packages not being able to find python
+
 * Fri May 01 2026 Steve Cossette <farchord@gmail.com> - 6.26.0-1
 - 6.26.0