From 81d604f0ca0bca7480a9e950075d12a1535f9aaabe75c67c8de3837b3c14f0c8 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 28 Nov 2022 10:49:24 +0000 Subject: [PATCH] - Disable PCH to drastically reduce the required disk space needed to build krita - Update _constraints - Spec cleanup OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=179 --- _constraints | 2 +- krita.changes | 8 ++++++++ krita.spec | 18 ++++++++---------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/_constraints b/_constraints index 891c663..293f62f 100644 --- a/_constraints +++ b/_constraints @@ -4,7 +4,7 @@ 4 - 28 + 10 diff --git a/krita.changes b/krita.changes index 685cf24..33175f6 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 28 09:27:13 UTC 2022 - Christophe Giboudeaux + +- Disable PCH to drastically reduce the required disk space + needed to build krita +- Update _constraints +- Spec cleanup + ------------------------------------------------------------------- Tue Nov 22 12:51:18 UTC 2022 - Christophe Giboudeaux diff --git a/krita.spec b/krita.spec index 4c5e7ef..8743f9c 100644 --- a/krita.spec +++ b/krita.spec @@ -19,8 +19,7 @@ %bcond_without released # Build fails on x86 and powerpc with xsimd (kde#462122) %ifnarch %ix86 ppc64 ppc64le -# TODO: Check if xsimd gets into 15.5 -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || (0%{?is_opensuse} && 0%{?sle_version} > 150400) %bcond_without xsimd %endif %endif @@ -29,7 +28,6 @@ Version: 5.1.3 Release: 0 Summary: Digital Painting Application License: BSD-2-Clause AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND CC0-1.0 AND LGPL-2.0-only -Group: Productivity/Graphics/Bitmap Editors URL: https://www.krita.org/ Source0: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz %if %{with released} @@ -116,7 +114,6 @@ matte painters, as well as illustrations and comics. %package devel Summary: Krita Build Environment -Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: cmake(Qt5Core) @@ -129,16 +126,17 @@ Development headers and libraries for Krita. %autosetup -p1 %build -# install translations to %%{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based) -# can probably be changed back to the standard location when calligra is KF5 based... -%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} -%make_jobs +%cmake_kf5 -d build -- -DKRITA_ENABLE_PCH:BOOL=OFF + +%cmake_build %install %kf5_makeinstall -C build -%suse_update_desktop_file -r org.kde.krita Qt KDE Graphics RasterGraphics + +%suse_update_desktop_file -r org.kde.krita Qt KDE Graphics RasterGraphics + %if %{with released} -%kf5_find_lang %{name} +%find_lang %{name} %endif chmod -x %{buildroot}%{_kf5_applicationsdir}/*.desktop