Accepting request 881464 from home:dimstar:Factory

- Add 93.patch: fix build with glib 2.67.3.

  "load error: /usr/lib64/libgomp.so.1: cannot allocate memory

OBS-URL: https://build.opensuse.org/request/show/881464
OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=107
This commit is contained in:
Bjørn Lie 2021-03-26 12:12:40 +00:00 committed by Git OBS Bridge
parent e1ce80f010
commit 1c4d93f77d
3 changed files with 36 additions and 2 deletions

27
93.patch Normal file
View File

@ -0,0 +1,27 @@
From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Fri, 5 Mar 2021 12:58:18 +0100
Subject: [PATCH] Fix build with glib 2.67.3 (see
https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
---
operations/external/exr-load.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
index e864f7e3e..28403639c 100644
--- a/operations/external/exr-load.cpp
+++ b/operations/external/exr-load.cpp
@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
#define GEGL_OP_NAME exr_load
#define GEGL_OP_C_FILE "exr-load.cpp"
-extern "C" {
#include "gegl-op.h"
-}
#include <ImfInputFile.h>
#include <ImfChannelList.h>
--
GitLab

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 26 08:14:25 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 93.patch: fix build with glib 2.67.3.
-------------------------------------------------------------------
Tue Dec 29 10:39:04 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gegl
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -31,6 +31,8 @@ Group: Productivity/Graphics/Other
URL: http://gegl.org/
Source0: https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM 93.patch dimstar@opensuse.org -- Fix build with glib 2.67.3
Patch0: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/93.patch
BuildRequires: ImageMagick
BuildRequires: asciidoc