This commit is contained in:
parent
390726d1ec
commit
ac01d1b17f
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 10 21:43:55 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Use GCC 13 on Leap 15
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 8 13:06:49 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
|
Wed Jan 8 13:06:49 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
11
gmic.spec
11
gmic.spec
@ -63,10 +63,15 @@ BuildRequires: krita
|
|||||||
#
|
#
|
||||||
# /SECTION
|
# /SECTION
|
||||||
#
|
#
|
||||||
BuildRequires: cmake >= 3.14.0
|
BuildRequires: cmake >= 3.16.0
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: fftw3-threads-devel
|
BuildRequires: fftw3-threads-devel
|
||||||
|
%if 0%{?suse_version} == 1500
|
||||||
|
# Qt 6 requires c++-17, we'll use the latest version available on Leap 15
|
||||||
|
BuildRequires: gcc13-c++
|
||||||
|
BuildRequires: gcc13-PIE
|
||||||
|
%endif
|
||||||
BuildRequires: hicolor-icon-theme
|
BuildRequires: hicolor-icon-theme
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
@ -171,6 +176,10 @@ This package contains shared data files for the various gmic frontends.
|
|||||||
dos2unix src/gmic_libc.*
|
dos2unix src/gmic_libc.*
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%if 0%{?suse_version} == 1500
|
||||||
|
export CC=gcc-13 CXX=g++-13
|
||||||
|
%endif
|
||||||
|
|
||||||
# Build gmic
|
# Build gmic
|
||||||
# Starting with gmic 3.1.0, the gmic dev replaced their CMake build system with a non-configurable Makefile...
|
# Starting with gmic 3.1.0, the gmic dev replaced their CMake build system with a non-configurable Makefile...
|
||||||
sed -i 's#LIB ?= lib#LIB ?= %{_lib}#' src/Makefile
|
sed -i 's#LIB ?= lib#LIB ?= %{_lib}#' src/Makefile
|
||||||
|
Loading…
x
Reference in New Issue
Block a user