SonicDE hard fork and upgrade to 6.7
This commit is contained in:
parent
49c8c3d2ce
commit
ca95bace9a
167 changed files with 16629 additions and 419 deletions
|
|
@ -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
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -up extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake.poppler_overlinking extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake
|
||||
--- extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake.poppler_overlinking 2017-09-09 07:07:55.000000000 -0500
|
||||
+++ extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake 2017-11-06 14:26:33.473536485 -0600
|
||||
@@ -85,7 +85,7 @@ set(Poppler_known_components
|
||||
)
|
||||
foreach(_comp ${Poppler_known_components})
|
||||
string(TOLOWER "${_comp}" _lc_comp)
|
||||
- set(Poppler_${_comp}_component_deps "Core")
|
||||
+ #set(Poppler_${_comp}_component_deps "Core")
|
||||
set(Poppler_${_comp}_pkg_config "poppler-${_lc_comp}")
|
||||
set(Poppler_${_comp}_lib "poppler-${_lc_comp}")
|
||||
set(Poppler_${_comp}_header_subdir "poppler/${_lc_comp}")
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
# Generated for SonicDE from Fedora's extra-cmake-modules.spec.
|
||||
# SonicDE is a hard fork of KDE Plasma; the sources come from the
|
||||
# https://github.com/Sonic-DE/sonic-frameworks-cmake-modules fork, not from download.kde.org.
|
||||
%define _disable_source_fetch 0
|
||||
%define debug_package %{nil}
|
||||
%global reponame sonic-frameworks-cmake-modules
|
||||
# Upstream KDE project: extra-cmake-modules
|
||||
%global oldname extra-cmake-modules
|
||||
|
||||
%global framework extra-cmake-modules
|
||||
|
||||
# uncomment to enable bootstrap mode
|
||||
#global bootstrap 1
|
||||
|
||||
%if !0%{?bootstrap}
|
||||
%global tests 1
|
||||
%endif
|
||||
|
||||
#Name: extra-cmake-modules
|
||||
Name: sonic-frameworks-cmake-modules
|
||||
Summary: Additional modules for CMake build system
|
||||
Version: 6.29.0
|
||||
Release: 1%{?dist}
|
||||
# kde-modules/clang-format.cmake is MIT
|
||||
License: BSD-3-Clause AND BSD-2-Clause AND MIT
|
||||
#URL: https://api.kde.org/ecm/
|
||||
URL: https://github.com/Sonic-DE/%{reponame}
|
||||
#Source0: http://download.kde.org/%%{stable_kf6}/frameworks/%%{majmin_ver_kf6}/%%{framework}-%%{version}.tar.xz
|
||||
Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{reponame}-%{version}.tar.gz
|
||||
#Source1: http://download.kde.org/%%{stable_kf6}/frameworks/%%{majmin_ver_kf6}/%%{framework}-%%{version}.tar.xz.sig
|
||||
BuildArch: noarch
|
||||
|
||||
## upstreamable patches
|
||||
# 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: sonic-rpm-macros
|
||||
BuildRequires: make
|
||||
# qcollectiongenerator
|
||||
BuildRequires: qt5-qttools-devel
|
||||
# sphinx-build
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: python3-sphinxcontrib-qthelp
|
||||
%global sphinx_build -DSphinx_BUILD_EXECUTABLE:PATH=%{_bindir}/sphinx-build-3
|
||||
|
||||
# Qt5Core is needed for tests to run properly (As-of 5.246.1).
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt6Core)
|
||||
%if 0%{?fedora} || 0%{?rhel} < 10
|
||||
Requires: (kf5-rpm-macros if qt5-qtbase-devel)
|
||||
%endif
|
||||
Requires: (sonic-rpm-macros if qt6-qtbase-devel)
|
||||
Recommends: appstream
|
||||
|
||||
Provides: extra-cmake-modules = %{version}-%{release}
|
||||
Conflicts: extra-cmake-modules < %{version}-%{release}
|
||||
|
||||
%description
|
||||
Additional modules for CMake build system needed by KDE Frameworks.
|
||||
|
||||
%package doc
|
||||
Summary: Developer Documentation files for %{name}
|
||||
Provides: extra-cmake-modules-doc = %{version}-%{release}
|
||||
Conflicts: extra-cmake-modules-doc < %{version}-%{release}
|
||||
|
||||
%description doc
|
||||
Developer Documentation files for %{name} for use with KDevelop or QtCreator.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{reponame}-%{version}
|
||||
|
||||
%build
|
||||
%cmake_kf6 \
|
||||
-DBUILD_MAN_DOCS:BOOL=OFF \
|
||||
-DBUILD_HTML_DOCS:BOOL=OFF \
|
||||
-DBUILD_QTHELP_DOCS:BOOL=ON \
|
||||
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \
|
||||
%{?sphinx_build}
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
# move to qt6 docdir so it shows up in Qt Creator by default
|
||||
mkdir %{buildroot}%{_qt6_docdir}
|
||||
mv %{buildroot}%{_kf6_docdir}/ECM/*.qch %{buildroot}%{_qt6_docdir}/
|
||||
|
||||
%check
|
||||
%if 0%{?tests}
|
||||
export CTEST_OUTPUT_ON_FAILURE=1
|
||||
make test ARGS="--output-on-failure --timeout 300" -C %{_vpath_builddir} ||:
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc README.rst
|
||||
%license LICENSES/*.txt
|
||||
%{_datadir}/ECM/
|
||||
|
||||
%files doc
|
||||
%{_qt6_docdir}/*.qch
|
||||
|
||||
%changelog
|
||||
* Mon Aug 24 2026 Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com> - 6.29.0-1
|
||||
- SonicDE hard fork build for Enterprise Linux 10 and Fedora
|
||||
Loading…
Add table
Add a link
Reference in a new issue