!4 修复master分支编译失败

From: @caodongxia
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-07-22 00:45:08 +00:00 committed by Gitee
commit 1315da985b
2 changed files with 31 additions and 1 deletions

26
0001-fix-C-linkage.patch Normal file
View File

@ -0,0 +1,26 @@
From 8208e9f61bb0d5688abcfe4fc94439219ee1c2f8 Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Wed, 21 Jul 2021 17:40:49 +0800
Subject: [PATCH] fix
---
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 e3a2538..96f1653 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>
--
2.27.0

View File

@ -1,10 +1,11 @@
Name: gegl04
Version: 0.4.8
Release: 3
Release: 4
Summary: Generic Graphics Library
License: LGPLv3+
URL: http://www.gegl.org/
Source0: http://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.bz2
Patch0000: 0001-fix-C-linkage.patch
BuildRequires: chrpath, enscript, gcc-c++, gettext-devel >= 0.19.8, gobject-introspection-devel >= 1.32.0, libspiro-devel, perl-interpreter
BuildRequires: ruby, SDL-devel >= 1.2.0, suitesparse-devel, vala-tools, pkgconfig(babl) >= 0.1.56, pkgconfig(cairo) >= 1.12.2, pkgconfig(exiv2) >= 0.25
@ -84,6 +85,9 @@ chrpath -d $RPM_BUILD_ROOT%{_libdir}/gegl-0.4/*.so
%doc %{_datadir}/gtk-doc/
%changelog
* Wed Jul 21 2021 caodongxia <caodongxia@huawei.com> - 0.4.8-4
- Fix C linkage
* Thu Jan 23 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.4.8-3
- Type:bugfix
- Id:NA