rpm/krita
SHA256
1
0
Fork 0
forked from pool/krita
Code Pull Requests Activity

Accepting request 816334 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Set minimum disk size for ppc64/ppc64le in _constraints to
  prevent "no space left on device" errors during build
- Fix build on ARM

OBS-URL: https://build.opensuse.org/request/show/816334
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=121
This commit is contained in:
Christophe Giboudeaux 2020-06-22 13:06:30 +00:00 committed by Git OBS Bridge
parent fd2da6ad53
commit f5acd22d01
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_constraints
View File

@ -4,4 +4,15 @@
<size unit="G">4</size>
</memory>
</hardware>
<overwrite>
<conditions>
<arch>ppc64</arch>
<arch>ppc64le</arch>
</conditions>
<hardware>
<disk>
<size unit="G">4</size>
</disk>
</hardware>
</overwrite>
</constraints>

7
krita.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jun 20 10:13:51 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
- Set minimum disk size for ppc64/ppc64le in _constraints to
prevent "no space left on device" errors during build
- Fix build on ARM
-------------------------------------------------------------------
Thu Jun 18 10:04:10 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>

7
krita.spec
View File

@ -31,7 +31,10 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND
Group: Productivity/Graphics/Bitmap Editors
URL: https://www.krita.org/
Source0: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz
%ifnarch %{arm} aarch64
# causes build failure on ARM currently
BuildRequires: OpenColorIO-devel
%endif
BuildRequires: OpenEXR-devel
BuildRequires: extra-cmake-modules
BuildRequires: fftw3-devel
@ -108,6 +111,10 @@ Development headers and libraries for Krita.
%setup -q
%build
%ifarch %{arm} aarch64
# workaround to avoid build failure on ARM, see https://bugs.kde.org/show_bug.cgi?id=421136
export CXXFLAGS="%{optflags} -DHAS_ONLY_OPENGL_ES"
%endif
# 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}