don't let the GIMP pkg-config file require gegl-0.3

This commit is contained in:
Nils Philippsen 2018-05-02 16:07:59 +02:00
parent 34675e016d
commit e63109135b
2 changed files with 34 additions and 1 deletions

24
gimp-2.10.0-gegl04.patch Normal file
View File

@ -0,0 +1,24 @@
From 7e19906827d301eb70275dba089849a632a0eabe Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Sat, 28 Apr 2018 00:27:31 +0200
Subject: [PATCH] gimp.pc: Fix reference to gegl-0.3.
---
gimp.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gimp.pc.in b/gimp.pc.in
index 9cf1da9557..9acf6cae88 100644
--- a/gimp.pc.in
+++ b/gimp.pc.in
@@ -12,6 +12,6 @@ gimplocaledir=@gimplocaledir@
Name: GIMP
Description: GIMP Library
Version: @GIMP_REAL_VERSION@
-Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.3 >= @GEGL_REQUIRED_VERSION@
+Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.4 >= @GEGL_REQUIRED_VERSION@
Libs: -L${libdir} -lgimp-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ -lgimpconfig-@GIMP_API_VERSION@ -lgimpcolor-@GIMP_API_VERSION@ -lgimpbase-@GIMP_API_VERSION@ @RT_LIBS@
Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@
--
2.17.0

View File

@ -61,7 +61,7 @@ Summary: GNU Image Manipulation Program
Name: gimp Name: gimp
Epoch: 2 Epoch: 2
Version: 2.10.0 Version: 2.10.0
%global rel 2 %global rel 3
Release: %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist} Release: %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}
# Compute some version related macros. # Compute some version related macros.
@ -192,6 +192,10 @@ Patch0: gimp-%{version}%{dashprerel}-git%{gitrev}.patch.bz2
# Fedora specific. # Fedora specific.
Patch1: gimp-2.10.0-cm-system-monitor-profile-by-default.patch Patch1: gimp-2.10.0-cm-system-monitor-profile-by-default.patch
# Don't let the GIMP pkg-config file require gegl-0.3.
# upstream commit 7e19906827d301eb70275dba089849a632a0eabe
Patch2: gimp-2.10.0-gegl04.patch
# use external help browser directly if help browser plug-in is not built # use external help browser directly if help browser plug-in is not built
Patch100: gimp-2.10.0-external-help-browser.patch Patch100: gimp-2.10.0-external-help-browser.patch
@ -284,6 +288,8 @@ EOF
%patch1 -p1 -b .cm-system-monitor-profile-by-default %patch1 -p1 -b .cm-system-monitor-profile-by-default
%patch2 -p1 -b .gegl04
%if ! %{with helpbrowser} %if ! %{with helpbrowser}
%patch100 -p1 -b .external-help-browser %patch100 -p1 -b .external-help-browser
%endif %endif
@ -658,6 +664,9 @@ make check %{?_smp_mflags}
%endif %endif
%changelog %changelog
* Wed May 02 2018 Nils Philippsen <nils@tiptoe.de> - 2:2.10.0-3
- don't let the GIMP pkg-config file require gegl-0.3
* Wed May 02 2018 Nils Philippsen <nils@tiptoe.de> - 2:2.10.0-2 * Wed May 02 2018 Nils Philippsen <nils@tiptoe.de> - 2:2.10.0-2
- require gegl04-tools instead of gegl (0.2) for building - require gegl04-tools instead of gegl (0.2) for building