CVS commit: pkgsrc/graphics/gimp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 11 15:10:25 UTC 2018

Modified Files:
        pkgsrc/graphics/gimp: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/gimp/patches: patch-gimp.pc.in

Log Message:
gimp: Fix gegl pattern in installed pkg-config file

Include gegl's bl3.mk in gimp's.

Update to 2.10.0nb1.


To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/gimp/buildlink3.mk
cvs rdiff -u -r1.90 -r1.91 pkgsrc/graphics/gimp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gimp/patches/patch-gimp.pc.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.282 pkgsrc/graphics/gimp/Makefile:1.283
--- pkgsrc/graphics/gimp/Makefile:1.282 Fri May 11 12:56:39 2018
+++ pkgsrc/graphics/gimp/Makefile       Fri May 11 15:10:25 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.282 2018/05/11 12:56:39 wiz Exp $
+# $NetBSD: Makefile,v 1.283 2018/05/11 15:10:25 wiz Exp $
 
 DISTNAME=      gimp-2.10.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/graphics/gimp/buildlink3.mk
diff -u pkgsrc/graphics/gimp/buildlink3.mk:1.60 pkgsrc/graphics/gimp/buildlink3.mk:1.61
--- pkgsrc/graphics/gimp/buildlink3.mk:1.60     Mon Apr 16 14:33:51 2018
+++ pkgsrc/graphics/gimp/buildlink3.mk  Fri May 11 15:10:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2018/04/16 14:33:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2018/05/11 15:10:25 wiz Exp $
 
 BUILDLINK_TREE+=       gimp
 
@@ -26,6 +26,7 @@ pkgbase := gimp
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/gegl/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/gimp/distinfo
diff -u pkgsrc/graphics/gimp/distinfo:1.90 pkgsrc/graphics/gimp/distinfo:1.91
--- pkgsrc/graphics/gimp/distinfo:1.90  Fri May 11 12:55:56 2018
+++ pkgsrc/graphics/gimp/distinfo       Fri May 11 15:10:25 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2018/05/11 12:55:56 wiz Exp $
+$NetBSD: distinfo,v 1.91 2018/05/11 15:10:25 wiz Exp $
 
 SHA1 (gimp-2.10.0.tar.bz2) = d8baa7fced2eddd78b4ed66e16b142c6cbbe5eec
 RMD160 (gimp-2.10.0.tar.bz2) = 719e57056b64de9d17962a05e08765786b553760
@@ -6,5 +6,6 @@ SHA512 (gimp-2.10.0.tar.bz2) = a87cf5b36
 Size (gimp-2.10.0.tar.bz2) = 30694779 bytes
 SHA1 (patch-aa) = 403c46d7070de208769e99e512922ba3a5b7129b
 SHA1 (patch-ab) = 37820b9e03702248294f0030ffbd09e7f14f3dcb
+SHA1 (patch-gimp.pc.in) = 2ff5d4e9674b7162ba6a077d91476a3c1cd38139
 SHA1 (patch-plug-ins_common_file-mng.c) = 8ed244997cdef7125e1aa5da4d0fac5068ad5159
 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797

Added files:

Index: pkgsrc/graphics/gimp/patches/patch-gimp.pc.in
diff -u /dev/null pkgsrc/graphics/gimp/patches/patch-gimp.pc.in:1.1
--- /dev/null   Fri May 11 15:10:25 2018
+++ pkgsrc/graphics/gimp/patches/patch-gimp.pc.in       Fri May 11 15:10:25 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-gimp.pc.in,v 1.1 2018/05/11 15:10:25 wiz Exp $
+
+Fix gegl pkg-config name.
+
+--- gimp.pc.in.orig    2018-03-25 12:35:18.000000000 +0000
++++ 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@