Accepting request 1227143 from graphics

Fix JPEG-XL disabling properly

OBS-URL: https://build.opensuse.org/request/show/1227143
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=145
This commit is contained in:
Ana Guerrero 2024-11-30 12:27:13 +00:00 committed by Git OBS Bridge
commit 9ffa5c8d61
2 changed files with 29 additions and 2 deletions

View File

@ -1,4 +1,21 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 28 14:47:18 UTC 2024 - Dirk Stoecker <opensuse@dstoecker.de>
- Fix jpeg-xl disabling, use proper with/without
-------------------------------------------------------------------
Mon Nov 11 15:16:56 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
- Disable jpeg-xl support on SLES < 16.0 (SP6, SP7)
libjxl is only in Leap/PackageHUB but not in SLES.
Leap gets gimp binary rpms from SLES.
(helps to fix bsc#1233157)
- Re-adding dropped references compared to SLES 15 SP6 changelog
CVE-2022-32990 CVE-2023-44441 CVE-2023-44442
CVE-2023-44443 CVE-2023-44444
bsc#1201192 bsc#1217160 bsc#1217161 bsc#1217162 bsc#1217163
-------------------------------------------------------------------
Fri Oct 18 08:15:54 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Fri Oct 18 08:15:54 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Add gtk-update-icon-cache BuildRequires: Ensure - Add gtk-update-icon-cache BuildRequires: Ensure
@ -3347,4 +3364,3 @@ Fri Jun 20 01:59:59 CEST 2003 - ro@suse.de
Tue Jun 10 13:16:54 CEST 2003 - sbrabec@suse.cz Tue Jun 10 13:16:54 CEST 2003 - sbrabec@suse.cz
- Initial SuSE version of GTK2 port. - Initial SuSE version of GTK2 port.

View File

@ -25,12 +25,18 @@
%else %else
%bcond_with libheif %bcond_with libheif
%endif %endif
# --without-jpegxl on SLES 15 SP6
%if 0%{?sle_version} && 0%{?sle_version} < 160000
%bcond_with libjpegxl
%else
%bcond_without libjpegxl
%endif
%if 0%{?sle_version} %if 0%{?sle_version}
%bcond_with python_plugin %bcond_with python_plugin
%else %else
%bcond_without python_plugin %bcond_without python_plugin
%endif %endif
Name: gimp Name: gimp
Version: 2.10.38 Version: 2.10.38
Release: 0 Release: 0
@ -62,7 +68,9 @@ BuildRequires: intltool >= 0.40.1
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libwmf-devel >= 0.2.8 BuildRequires: libwmf-devel >= 0.2.8
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
%if %{with libjpegxl}
BuildRequires: libjxl-devel >= 0.7.0 BuildRequires: libjxl-devel >= 0.7.0
%endif
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if %{with python_plugin} %if %{with python_plugin}
BuildRequires: python-gtk-devel >= 2.10.4 BuildRequires: python-gtk-devel >= 2.10.4
@ -244,6 +252,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
--libexecdir=%{_libexecdir}\ --libexecdir=%{_libexecdir}\
--enable-default-binary\ --enable-default-binary\
--disable-check-update\ --disable-check-update\
%if %{without libjpegxl}
--without-jpegxl\
%endif
--enable-mp --enable-mp
%make_build %make_build