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

Accepting request 876275 from home:bnavigator:pyqt:dependers

Browse Source 
- BuildConflict on python3-sip-devel >= 6 because the build expects
  the sip5 executable (or even older sip from SIP v4), which was
  removed in SIP v6. A simple BuildRequire python3-sip-devel < 6
  would result in a parallel install of SIPv4 and SIPv6, which do
  not conflict per se.  Because CMake sees the SIPv6 modules, it
  assumes sip5 to be present, does not look for the old sip command
  and fails.

OBS-URL: https://build.opensuse.org/request/show/876275
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=137
This commit is contained in:
Christophe Giboudeaux 2021-03-06 07:28:21 +00:00 committed by Git OBS Bridge
parent 5b877a2ed0
commit b302a8b368
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
krita.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Mar 2 15:57:09 UTC 2021 - Ben Greiner <code@bnavigator.de>
- BuildConflict on python3-sip-devel >= 6 because the build expects
the sip5 executable (or even older sip from SIP v4), which was
removed in SIP v6. A simple BuildRequire python3-sip-devel < 6
would result in a parallel install of SIPv4 and SIPv6, which do
not conflict per se. Because CMake sees the SIPv6 modules, it
assumes sip5 to be present, does not look for the old sip command
and fails.
-------------------------------------------------------------------
Tue Jan 19 12:28:32 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>

8
krita.spec
View File

@ -57,8 +57,16 @@ BuildRequires: libtiff-devel
BuildRequires: openjpeg2-devel
BuildRequires: perl
BuildRequires: pkgconfig
# SECTION python build requirements
BuildRequires: python3-devel
BuildRequires: python3-qt5-devel
# Krita's CMake requires the command `sip5` from SIP v5 or `sip` from SIP v4.
# Neither is available in SIP v6. A simple sip-devel < 6 build requirement would
# install a non-conflicting SIP v4 in parallel to v6 pulled in by qt5-devel.
# But then CMake does not find the old sip executable.
BuildConflicts: python3-sip-devel >= 6
BuildRequires: python3-sip-devel
# /SECTION
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
BuildRequires: cmake(KF5Archive)