diff --git a/.gegl04.metadata b/.gegl04.metadata index 1cea7f8..a60a983 100644 --- a/.gegl04.metadata +++ b/.gegl04.metadata @@ -1 +1 @@ -5409c096dcba512186a0a6a8ef2449d62b2affae SOURCES/gegl-0.4.30.tar.xz +055c28bb3c942f85b744201009ac8e02e4182624 SOURCES/gegl-0.4.34.tar.xz diff --git a/.gitignore b/.gitignore index 4eaf323..1e871c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gegl-0.4.30.tar.xz +SOURCES/gegl-0.4.34.tar.xz diff --git a/SOURCES/gegl04-gtk.patch b/SOURCES/gegl04-gtk.patch new file mode 100644 index 0000000..3ea14a9 --- /dev/null +++ b/SOURCES/gegl04-gtk.patch @@ -0,0 +1,30 @@ +From cf7e328c931a46997fbc4a40540afccd2da8f1e9 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Thu, 9 Sep 2021 13:00:36 +0100 +Subject: [PATCH] docs: Don't scan ctx.h with gtk-doc + +ctx.h contains both declarations and implementation, causing gtk-doc to +fail. It isn't part of GEGL's public API anyway, so don't try to +document it as such. + +Signed-off-by: Simon McVittie +--- + docs/reference/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/reference/meson.build b/docs/reference/meson.build +index 8193a25ba..2348cec92 100644 +--- a/docs/reference/meson.build ++++ b/docs/reference/meson.build +@@ -12,6 +12,7 @@ if gtkdoc_scan.found() + project_source_root / 'gegl', + project_build_root / 'gegl', + ], ++ ignore_headers: ['ctx.h'], + fixxref_args: [ + '--html-dir=@0@'.format(gegl_gtk_docdir), + '--extra-dir=@0@'.format(glib_gtk_docdir), +-- +GitLab + + diff --git a/SOURCES/gegl04-openexr.patch b/SOURCES/gegl04-openexr.patch new file mode 100644 index 0000000..0b34f79 --- /dev/null +++ b/SOURCES/gegl04-openexr.patch @@ -0,0 +1,12 @@ +Index: gegl-0.4.30/operations/external/exr-save.cc +=================================================================== +--- gegl-0.4.30.orig/operations/external/exr-save.cc ++++ gegl-0.4.30/operations/external/exr-save.cc +@@ -39,6 +39,7 @@ extern "C" { + } /* extern "C" */ + + #include ++#include + #include + #include + #include diff --git a/SPECS/gegl04.spec b/SPECS/gegl04.spec index bfcc23f..d034196 100644 --- a/SPECS/gegl04.spec +++ b/SPECS/gegl04.spec @@ -1,8 +1,8 @@ %global apiver 0.4 Name: gegl04 -Version: 0.4.30 -Release: 5%{?dist} +Version: 0.4.34 +Release: 1%{?dist} Summary: Graph based image processing framework # The binary is under the GPL, while the libs are under LGPL. @@ -11,6 +11,9 @@ License: LGPLv3+ URL: http://www.gegl.org/ Source0: http://download.gimp.org/pub/gegl/%{apiver}/gegl-%{version}.tar.xz +Patch0: gegl04-openexr.patch +Patch1: gegl04-gtk.patch + BuildRequires: chrpath BuildRequires: enscript BuildRequires: gcc-c++ @@ -116,7 +119,7 @@ GEGL library. %build -%meson --auto-features=auto -Ddocs=true +%meson --auto-features=auto -Ddocs=true -Dgtk-doc=true %meson_build @@ -170,6 +173,10 @@ chrpath --delete %{buildroot}%{_libdir}/gegl-%{apiver}/*.so %changelog +* Wed Feb 02 2022 Josef Ridky - 0.4.34-1 +- New upstream release 0.4.34 (#2045018) +- Fix CVE-2021-45463 + * Mon Aug 09 2021 Mohan Boddu - 0.4.30-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688