pool/gmic
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1236940 from graphics

Browse Source 
- Use GCC 13 on Leap 15

- switch all the Qt gui implementations to Qt6 except for the krita
  one, as this also still pulls KF5 libraries, not sure how well
  mixing KF5 and QT6 would work. (boo#1218653#c14)

OBS-URL: https://build.opensuse.org/request/show/1236940
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gmic?expand=0&rev=45
This commit is contained in:
Ana Guerrero 2025-01-12 10:21:42 +00:00 committed by Git OBS Bridge
commit de1bd26245
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gmic.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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>
- switch all the Qt gui implementations to Qt6 except for the krita
one, as this also still pulls KF5 libraries, not sure how well
mixing KF5 and QT6 would work. (boo#1218653#c14)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 7 13:10:52 UTC 2025 - Marcus Rueckert <mrueckert@suse.de> Tue Jan 7 13:10:52 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>

23
gmic.spec
View File

@ -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
@ -80,6 +85,12 @@ BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5Xml)
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6Gui)
BuildRequires: cmake(Qt6LinguistTools)
BuildRequires: cmake(Qt6Network)
BuildRequires: cmake(Qt6Widgets)
BuildRequires: cmake(Qt6Xml)
BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
@ -165,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
@ -185,20 +200,20 @@ EXTRA_CFLAGS='%{optflags}' NOSTRIP=1 %__make cli_shared %{?_smp_mflags}
# Build gmic{_gimp|_krita}_qt # Build gmic{_gimp|_krita}_qt
pushd gmic-qt pushd gmic-qt
%cmake %{gmic_qt_options} -DGMIC_QT_HOST=none %cmake %{gmic_qt_options} -DGMIC_QT_HOST=none -DBUILD_WITH_QT6=ON
%cmake_build %cmake_build
cd .. cd ..
for hostapp in %{hostapps} ; do for hostapp in %{hostapps} ; do
%cmake %{gmic_qt_options} -DGMIC_QT_HOST=${hostapp} %cmake %{gmic_qt_options} -DGMIC_QT_HOST=${hostapp} -DBUILD_WITH_QT6=ON
%cmake_build %cmake_build
cd .. cd ..
done done
%if %{with krita5} %if %{with krita5}
%cmake_kf5 -d plugin-build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %{gmic_qt_options} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=RelWithDebInfo %cmake_kf5 -d plugin-build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %{gmic_qt_options} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_QT6=OFF
%cmake_build %cmake_build