From 04666ee75cdad6ece4e4d237e299a3daf65c77bc Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 4 Apr 2025 21:33:55 -0700 Subject: [PATCH] fix(lomiri-ui-toolkit): Update patches and Python subpackage build/install steps (#4229) (#4257) * fix(lomiri-ui-toolkit): Update patches Signed-off-by: Gilver * fix: Remove `python3` subpackage? Signed-off-by: Gilver * Revert "fix: Remove `python3` subpackage?" This reverts commit 00d98e978b7c1fed4ba8c7cedc903fbc15c873c0. * I fixed it, it was Debian specific changes * Oops no * NO??? * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * So confused Signed-off-by: Gilver * Un-array? Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Enough Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit c54c745b13f9b45b64bab85d57a8821018412fc4) Co-authored-by: Gilver --- .../lomiri-ui-toolkit/lomiri-ui-toolkit.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index 3fdcdb363a..cfaf42d970 100644 --- a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -10,8 +10,7 @@ Summary: QML components to ease the creation of beautiful applications in License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit Source0: %{url}/-/archive/%commit/lomiri-ui-toolkit-%commit.tar.gz -Patch0: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/0002-fix-tests-on-qt-5.15.5.patch -Patch1: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/2003_stop-using-Ubuntu-fonts.patch +Patch0: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5110+dfsg-2/debian/patches/2003_stop-using-Ubuntu-fonts.patch BuildRequires: pkgconfig BuildRequires: make @@ -31,9 +30,11 @@ BuildRequires: qt5-qtfeedback BuildRequires: qt5-qtsystems-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-pim-devel +BuildRequires: python3-devel BuildRequires: python3-rpm-macros BuildRequires: qt5-qtsvg-devel BuildRequires: fdupes +BuildRequires: python3dist(setuptools) Requires: qt5-qtgraphicaleffects Requires: qt5-qtfeedback @@ -82,7 +83,9 @@ Examples for Lomiri-ui-toolkit. %build %{qmake_qt5} 'CONFIG+=ubuntu-uitk-compat' 'CONFIG+=test' - +pushd tests/autopilot +%py3_build +popd %make_build %install @@ -92,6 +95,11 @@ rm -rf %{buildroot}%{_qt5_qmldir}/Extinct %fdupes %buildroot%_libdir/qt5/qml/Lomiri/Components/ %fdupes %buildroot%_libdir/qt5/examples/%name/examples/ +pushd tests/autopilot +%py3_install +mv lomiriuitoolkit/{tests,_custom_proxy_objects} %{buildroot}%{python3_sitelib}/lomiriuitoolkit/ +popd + %find_lang %{name} %find_lang %{name}-gallery @@ -135,6 +143,8 @@ rm -rf %{buildroot}%{_qt5_qmldir}/Extinct %doc README.md %dir %{python3_sitelib}/lomiriuitoolkit %{python3_sitelib}/lomiriuitoolkit/*.py +%dir %{python3_sitelib}/lomiriuitoolkit-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/lomiriuitoolkit-%{version}-py%{python3_version}.egg-info/* %{python3_sitelib}/lomiriuitoolkit/_custom_proxy_objects/ %{python3_sitelib}/lomiriuitoolkit/__pycache__/ %{python3_sitelib}/lomiriuitoolkit/tests/