From c87f1ca0ec0048b5fe6ff29e45535459182bcd6a Mon Sep 17 00:00:00 2001 From: cherry530 <707078654@qq.com> Date: Thu, 19 Oct 2023 11:25:25 +0800 Subject: [PATCH] adapted babl Signed-off-by: cherry530 <707078654@qq.com> --- adapted-babl.patch | 28 ++++++++++++++++++++++++++++ gimp.spec | 8 ++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 adapted-babl.patch diff --git a/adapted-babl.patch b/adapted-babl.patch new file mode 100644 index 0000000..6a6c480 --- /dev/null +++ b/adapted-babl.patch @@ -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 + diff --git a/gimp.spec b/gimp.spec index c262423..cab5293 100644 --- a/gimp.spec +++ b/gimp.spec @@ -44,7 +44,7 @@ Name: gimp Version: 2.99.6 -Release: 2 +Release: 3 Epoch: 2 Summary: The GNU Image Manipulation Program License: GPL-3.0-or-later @@ -57,6 +57,7 @@ Source3: MAINTAINERS Source98: gimp-rpmlintrc Source99: baselibs.conf Patch0: git_info_from_dirname.patch +Patch1: adapted-babl.patch BuildRequires: autoconf glibc-all-langpacks BuildRequires: automake BuildRequires: libtool @@ -78,7 +79,7 @@ BuildRequires: pkgconfig(OpenEXR) >= %{OpenEXR_version} BuildRequires: pkgconfig(alsa) >= %{alsa_version} BuildRequires: pkgconfig(appstream-glib) >= %{appstream_glib_version} BuildRequires: pkgconfig(atk) >= %{atk_version} -BuildRequires: pkgconfig(babl) >= %{babl_version} +BuildRequires: pkgconfig(babl-0.1) >= %{babl_version} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(cairo) >= %{cairo_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 %changelog +* Thu Oct 19 2023 xu_ping <707078654@qq.com> - 2:2.99.6-3 +- adapted babl + * Mon Jun 13 2022 houyingchao - 2:2.99.6-2 - Fix compilation failed -- Gitee