From 37a2a71faf6e23035d669ff78e894567e2950ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Wed, 2 Feb 2022 08:47:06 +0100 Subject: [PATCH] Resolves: #2045018 - new upstream release 0.4.34 --- .gitignore | 1 + gegl04-gtk.patch | 30 ++++++++++++++++++++++++++++++ gegl04-openexr.patch | 12 ++++++++++++ gegl04.spec | 13 ++++++++++--- sources | 2 +- 5 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 gegl04-gtk.patch create mode 100644 gegl04-openexr.patch diff --git a/.gitignore b/.gitignore index 6ea8fad..636e2d5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /gegl-0.4.24.tar.xz /gegl-0.4.26.tar.xz /gegl-0.4.30.tar.xz +/gegl-0.4.34.tar.xz diff --git a/gegl04-gtk.patch b/gegl04-gtk.patch new file mode 100644 index 0000000..3ea14a9 --- /dev/null +++ b/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/gegl04-openexr.patch b/gegl04-openexr.patch new file mode 100644 index 0000000..0b34f79 --- /dev/null +++ b/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/gegl04.spec b/gegl04.spec index bfcc23f..d034196 100644 --- a/gegl04.spec +++ b/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 diff --git a/sources b/sources index b3208b8..e6581ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gegl-0.4.30.tar.xz) = 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378 +SHA512 (gegl-0.4.34.tar.xz) = 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e