packages/gimp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!22 适配babl的升级

Browse Source 
From: @cherry530 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2023-10-23 02:23:31 +00:00 committed by Gitee
commit 60d671f370
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
adapted-babl.patch Normal file
View File

@ -0,0 +1,28 @@
From a0b20d74c25211d32fdf9579f98aed36d3f8cb9d Mon Sep 17 00:00:00 2001
From: cherry530 <707078654@qq.com>
Date: Wed, 18 Oct 2023 17:06:28 +0800
Subject: [PATCH] adapted babl
Signed-off-by: cherry530 <707078654@qq.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9d6420c..41981ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,8 +716,8 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
# Checks for required libraries
###############################
-PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],,
- [add_deps_error([babl >= babl_required_version])])
+PKG_CHECK_MODULES(BABL, [babl-0.1 >= babl_required_version],,
+ [add_deps_error([babl-0.1 >= babl_required_version])])
PKG_CHECK_MODULES(GEGL, gegl-gegl_major_minor_version >= gegl_required_version,,
[add_deps_error([gegl-gegl_major_minor_version >= gegl_required_version])])
PKG_CHECK_MODULES(ATK, atk >= atk_required_version,,
--
2.27.0

8
gimp.spec
View File

@ -44,7 +44,7 @@
Name: gimp Name: gimp
Version: 2.99.6 Version: 2.99.6
Release: 2 Release: 3
Epoch: 2 Epoch: 2
Summary: The GNU Image Manipulation Program Summary: The GNU Image Manipulation Program
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -57,6 +57,7 @@ Source3: MAINTAINERS
Source98: gimp-rpmlintrc Source98: gimp-rpmlintrc
Source99: baselibs.conf Source99: baselibs.conf
Patch0: git_info_from_dirname.patch Patch0: git_info_from_dirname.patch
Patch1: adapted-babl.patch
BuildRequires: autoconf glibc-all-langpacks BuildRequires: autoconf glibc-all-langpacks
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
@ -78,7 +79,7 @@ BuildRequires: pkgconfig(OpenEXR) >= %{OpenEXR_version}
BuildRequires: pkgconfig(alsa) >= %{alsa_version} BuildRequires: pkgconfig(alsa) >= %{alsa_version}
BuildRequires: pkgconfig(appstream-glib) >= %{appstream_glib_version} BuildRequires: pkgconfig(appstream-glib) >= %{appstream_glib_version}
BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk) >= %{atk_version}
BuildRequires: pkgconfig(babl) >= %{babl_version} BuildRequires: pkgconfig(babl-0.1) >= %{babl_version}
BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(cairo) >= %{cairo_version} BuildRequires: pkgconfig(cairo) >= %{cairo_version}
BuildRequires: pkgconfig(cairo-pdf) >= %{cairo_pdf_version} BuildRequires: pkgconfig(cairo-pdf) >= %{cairo_pdf_version}
@ -416,6 +417,9 @@ install -m 644 -c macros.gimp \
%{_libdir}/gimp/2.99/extensions/org.gimp.extension.goat-exercises %{_libdir}/gimp/2.99/extensions/org.gimp.extension.goat-exercises
%changelog %changelog
* Thu Oct 19 2023 xu_ping <707078654@qq.com> - 2:2.99.6-3
- adapted babl
* Mon Jun 13 2022 houyingchao <houyingchao@h-partners.com> - 2:2.99.6-2 * Mon Jun 13 2022 houyingchao <houyingchao@h-partners.com> - 2:2.99.6-2
- Fix compilation failed - Fix compilation failed